IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipapython.sysrestore: Use str methods instead of functions from the string module

Browse Source 
For historical reasons, the string module contained some functions
that mirror methods of the str type. These are eremoved in Python 3.

Use str methods instead.

Part of the work for https://fedorahosted.org/freeipa/ticket/5638

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Petr Viktorin
2016-02-19 17:38:30 +01:00
committed by Jan Cholasta
parent 4656d6bf6b
commit 724238279a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ipapython/sysrestore.py
View File

@@ -28,7 +28,6 @@ import os.path
import shutil import shutil
from ipapython.ipa_log_manager import * from ipapython.ipa_log_manager import *
import random import random
import string
import six import six
from six.moves.configparser import SafeConfigParser from six.moves.configparser import SafeConfigParser
@@ -134,7 +133,8 @@ class FileStore:
stat = os.stat(path) stat = os.stat(path)
self.files[filename] = string.join([str(stat.st_mode),str(stat.st_uid),str(stat.st_gid),path], ',') template = '{stat.st_mode},{stat.st_uid},{stat.st_gid},{path}'
self.files[filename] = template.format(stat=stat, path=path)
self.save() self.save()
def has_file(self, path): def has_file(self, path):
@@ -144,7 +144,7 @@ class FileStore:
""" """
result = False result = False
for (key, value) in self.files.items(): for (key, value) in self.files.items():
(mode,uid,gid,filepath) = string.split(value, ',', 3) (mode,uid,gid,filepath) = value.split(',', 3)
if (filepath == path): if (filepath == path):
result = True result = True
break break
@@ -177,7 +177,7 @@ class FileStore:
filename = None filename = None
for (key, value) in self.files.items(): for (key, value) in self.files.items():
(mode,uid,gid,filepath) = string.split(value, ',', 3) (mode,uid,gid,filepath) = value.split(',', 3)
if (filepath == path): if (filepath == path):
filename = key filename = key
break break
@@ -219,7 +219,7 @@ class FileStore:
for (filename, value) in self.files.items(): for (filename, value) in self.files.items():
(mode,uid,gid,path) = string.split(value, ',', 3) (mode,uid,gid,path) = value.split(',', 3)
backup_path = os.path.join(self._path, filename) backup_path = os.path.join(self._path, filename)
if not os.path.exists(backup_path): if not os.path.exists(backup_path):
@@ -268,7 +268,7 @@ class FileStore:
filename = None filename = None
for (key, value) in self.files.items(): for (key, value) in self.files.items():
(mode,uid,gid,filepath) = string.split(value, ',', 3) (mode,uid,gid,filepath) = value.split(',', 3)
if (filepath == path): if (filepath == path):
filename = key filename = key
break break