# HG changeset patch # User Augie Fackler # Date 1241405631 18000 # Node ID 5dc8fee7fc96a135c128f599db9f107f4d3d5344 # Parent c3c647aff97c180190522c81f84de55615a94ac6 Less import * diff --git a/hg_delta_editor.py b/hg_delta_editor.py --- a/hg_delta_editor.py +++ b/hg_delta_editor.py @@ -16,7 +16,7 @@ from svn import core import svnexternals import util -from maps import * +import maps def pickle_atomic(data, file_path, dir=None): """pickle some data to a path atomically. @@ -125,7 +125,7 @@ class HgChangeReceiver(delta.Editor): self.tag_locations.reverse() self.clear_current_info() - self.authors = AuthorMap(self.ui, self.authors_file, + self.authors = maps.AuthorMap(self.ui, self.authors_file, defaulthost=author_host) if authors: self.authors.load(authors) diff --git a/tests/__init__.py b/tests/__init__.py --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,5 +1,3 @@ import sys import os sys.path.append(os.path.dirname(os.path.dirname(__file__))) - -from run import *