Index: vcpx/changes.py
===================================================================
--- vcpx/changes.py	(revision 1634)
+++ vcpx/changes.py	(revision 1637)
@@ -32,14 +32,15 @@
     CONFLICT = 'CONFLICT'
 
+    old_name = None
+    old_revision = None
+    new_revision = None
+    action_kind = None
+    status = None
+    unidiff = None # This is the unidiff of this particular entry
+    is_directory = False # This usually makes sense only on ADDs and DELs
+    is_symlink = False
+
     def __init__(self, name):
         self.name = name
-        self.old_name = None
-        self.old_revision = None
-        self.new_revision = None
-        self.action_kind = None
-        self.status = None
-        self.unidiff = None # This is the unidiff of this particular entry
-        self.is_directory = False # This usually makes sense only on ADDs and DELs
-        self.is_symlink = False
 
     def __str__(self):
Index: vcpx/repository/darcs/target.py
===================================================================
--- vcpx/repository/darcs/target.py	(revision 1618)
+++ vcpx/repository/darcs/target.py	(revision 1638)
@@ -12,4 +12,5 @@
 __docformat__ = 'reStructuredText'
 
+from os.path import join, exists
 import re
 
@@ -33,5 +34,4 @@
     def importFirstRevision(self, source_repo, changeset, initial):
         from os import walk, sep
-        from os.path import join
         from vcpx.dualwd import IGNORED_METADIRS
 
@@ -164,6 +164,4 @@
         """
 
-        from os.path import join, exists
-
         # The "_darcs/patches/pending" file is basically a patch containing
         # only the changes (hunks, adds...) not yet recorded by darcs: it does
@@ -248,6 +246,4 @@
         """
 
-        from os.path import join, exists
-
         metadir = join(self.repository.basedir, '_darcs')
 
@@ -278,6 +274,4 @@
         Tweak the default settings of the repository.
         """
-
-        from os.path import join
 
         motd = open(join(self.repository.basedir, '_darcs/prefs/motd'), 'w')