summaryrefslogtreecommitdiff
path: root/processors
diff options
context:
space:
mode:
authorRichard Wilbur <richard.wilbur@gmail.com>2014-06-02 20:58:47 -0600
committerRichard Wilbur <richard.wilbur@gmail.com>2014-06-02 20:58:47 -0600
commit6978da619c1c9dbee6554ffa70484e48b7f1e9d1 (patch)
tree55f02323fb2f16cd6328112f7be61e402b0f74c2 /processors
parentb7b3d7f360c9f8c0d7315aae56bca63ad9f48411 (diff)
parentb7e626f15fd3059686b8925b4e854568519fd92c (diff)
downloadbzr-fastimport-6978da619c1c9dbee6554ffa70484e48b7f1e9d1.tar.gz
Fix bzr-fastimport when used with newer versions of python-fastimport.(Jelmer Vernooij)HEADtrunk
Diffstat (limited to 'processors')
-rw-r--r--processors/generic_processor.py2
-rw-r--r--processors/info_processor.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/processors/generic_processor.py b/processors/generic_processor.py
index 80b0c5d..ae63ad8 100644
--- a/processors/generic_processor.py
+++ b/processors/generic_processor.py
@@ -40,6 +40,7 @@ except ImportError:
from bzrlib.plugins.fastimport import (
branch_updater,
cache_manager,
+ helpers,
idmapfile,
marks_file,
revision_store,
@@ -47,7 +48,6 @@ from bzrlib.plugins.fastimport import (
from fastimport import (
commands,
errors as plugin_errors,
- helpers,
processor,
)
diff --git a/processors/info_processor.py b/processors/info_processor.py
index bb162e7..af80557 100644
--- a/processors/info_processor.py
+++ b/processors/info_processor.py
@@ -18,14 +18,14 @@
from bzrlib.plugins.fastimport import (
reftracker,
)
+from bzrlib.plugins.fastimport.helpers import (
+ invert_dict,
+ invert_dictset,
+ )
from fastimport import (
commands,
processor,
)
-from fastimport.helpers import (
- invert_dict,
- invert_dictset,
- )
import stat