danny/doku2git
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

doku2git: Avoid shadowing the type function.

Browse Source
This commit is contained in:
Danny Robson 2019-07-07 14:38:21 +10:00
parent a244617c56
commit e0092a365b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doku2git.py
View File

@ -324,7 +324,7 @@ class Dokuwiki:
found[None] = User(login="system", real_name="system", email="system@mlug-au.org") found[None] = User(login="system", real_name="system", email="system@mlug-au.org")
return found return found
def _find_meta(self, root: str, type): def _find_meta(self, root: str, klass):
for dirpath, dirnames, filenames in os.walk(root): for dirpath, dirnames, filenames in os.walk(root):
for file in filenames: for file in filenames:
# We don't really care about 'indexed' or 'meta' files. # We don't really care about 'indexed' or 'meta' files.
@ -339,10 +339,10 @@ class Dokuwiki:
# Actually read the metadata # Actually read the metadata
path = os.path.join(dirpath, file) path = os.path.join(dirpath, file)
for change in self._read_meta(path, type): for change in self._read_meta(path, klass):
yield change yield change
def _read_meta(self, path: str, type): def _read_meta(self, path: str, klass):
log.debug("extracting meta from %s", path) log.debug("extracting meta from %s", path)
with open(path, 'r') as data: with open(path, 'r') as data:
for entry in data: for entry in data:
@ -358,7 +358,7 @@ class Dokuwiki:
raise RuntimeError("Empty user doesn't correspond to 'external edit'") raise RuntimeError("Empty user doesn't correspond to 'external edit'")
user = None user = None
yield type( yield klass(
timestamp=timestamp, timestamp=timestamp,
ip=ip, ip=ip,
operation=operation, operation=operation,