1.1 --- a/moinformat/input/directory.py Sun Aug 05 19:07:27 2018 +0200
1.2 +++ b/moinformat/input/directory.py Sun Aug 05 19:07:53 2018 +0200
1.3 @@ -23,7 +23,7 @@
1.4 from moinformat.utils.directory import Directory
1.5 from os.path import sep
1.6
1.7 -class DirectoryInput(Input, Directory):
1.8 +class DirectoryInput(Input):
1.9
1.10 "A directory output context."
1.11
1.12 @@ -37,7 +37,7 @@
1.13 raise ValueError, parameters
1.14
1.15 Input.__init__(self, parameters)
1.16 - Directory.__init__(self, parameters["filename"])
1.17 + self.dir = Directory(parameters["filename"])
1.18
1.19 # Support an encoding of the level separator for the filesystem.
1.20 # Where it is the same as the directory separator, documents are stored
1.21 @@ -49,7 +49,7 @@
1.22
1.23 "Return all pages in the context."
1.24
1.25 - return map(self.to_pagename, self.select_files("*"))
1.26 + return map(self.to_pagename, self.dir.select_files("*"))
1.27
1.28 # Page characteristics.
1.29
1.30 @@ -58,7 +58,7 @@
1.31 "Return the subpage filenames of 'pagename'."
1.32
1.33 pattern = self.to_filename("%s/*" % pagename)
1.34 - return self.select_files(pattern)
1.35 + return self.dir.select_files(pattern)
1.36
1.37 def subpages(self, pagename):
1.38
1.39 @@ -75,7 +75,7 @@
1.40 'encoding'.
1.41 """
1.42
1.43 - return self.readpath(self.get_filename(filename), encoding)
1.44 + return self.readpath(self.dir.get_filename(filename), encoding)
1.45
1.46 # NOTE: Translation methods should encode filenames appropriately.
1.47