From d3482d3ec0ca24b07e56a7d5375e613f47021870 Mon Sep 17 00:00:00 2001 From: mhagger Date: Sat, 12 Jun 2010 09:37:33 +0000 Subject: [PATCH] Call the CVSPath superclass constructor as soon as possible. git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5145 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- cvs2svn_lib/cvs_path.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cvs2svn_lib/cvs_path.py b/cvs2svn_lib/cvs_path.py index b42ba304..7a377075 100644 --- a/cvs2svn_lib/cvs_path.py +++ b/cvs2svn_lib/cvs_path.py @@ -201,11 +201,11 @@ class CVSDirectory(CVSPath): def __init__(self, id, project, parent_directory, basename): """Initialize a new CVSDirectory object.""" + CVSPath.__init__(self, id, project, parent_directory, basename) + # This member is filled in by CollectData.close(): self.empty_subdirectory_ids = [] - CVSPath.__init__(self, id, project, parent_directory, basename) - def _calculate_filename(self): """Return the filesystem path to this CVSPath in the CVS repository.""" @@ -296,13 +296,17 @@ class CVSFile(CVSPath): assert parent_directory is not None + # This member is needed by _calculate_filename(), which is called + # by CVSPath.__init__(). So initialize it before calling + # CVSPath.__init__(). self._in_attic = in_attic + CVSPath.__init__(self, id, project, parent_directory, basename) + self.executable = executable self.file_size = file_size self.mode = mode self.description = description self.properties = {} - CVSPath.__init__(self, id, project, parent_directory, basename) def _calculate_filename(self): """Return the filesystem path to this CVSPath in the CVS repository.""" -- 2.11.4.GIT