--- a/degal/filesystem.py Wed Jul 01 20:25:35 2009 +0300
+++ b/degal/filesystem.py Wed Jul 01 20:40:00 2009 +0300
@@ -77,7 +77,7 @@
# this should fail for non-ASCII str
return name.encode('utf-8')
- def __init__ (self, parent, fsname=None, name=None, config=None) :
+ def __init__ (self, parent, fsname=None, name=None) :
"""
Initialize the node with a parent and both name/fsname.
@@ -100,23 +100,12 @@
if parent and not fsname and not name :
# no name given -> we're the same as parent
- self.parent, self.config, self.fsname, self.name = parent.parent, parent.config, parent.fsname, parent.name
+ self.parent, self.fsname, self.name = parent.parent, parent.fsname, parent.name
else :
# store
self.parent = parent
- # config, either as given, or copy from parent
- if config :
- self.config = config
-
- elif parent :
- self.config = parent.config
-
- else :
- # XXX: no config
- self.config = None
-
# fsname
if fsname :
self.fsname = fsname
@@ -397,7 +386,7 @@
The first and last nodes may be Files, but all other objects must be Directories.
XXX: better to keep Paths symbolic/relative?
- XXX: welcome to Circular Reference Hell, a place has been reserved for you
+ XXX: welcome to Circular Reference Hell
"""
def __init__ (self, *nodes) :
@@ -696,14 +685,14 @@
A special Directory that overrides the Node methods to anchor the recursion/etc at some 'real' filesystem path.
"""
- # XXX: config needs a default
- def __init__ (self, fspath, config=None) :
+ def __init__ (self, fspath) :
"""
Construct the directory tree root at the given 'real' path, which must be a raw str
"""
# abuse Node's concept of a "name" a bit
- super(Root, self).__init__(None, fspath, config=config)
+ # XXX: this will break path manipulations, methinks
+ super(Root, self).__init__(None, fspath)
def nodepath (self) :
"""