initial set of adjustments to make (most) imports work.

More to come, especially when it's about strings

1 files changed, 15 insertions, 14 deletions

diff --git a/git/remote.py b/git/remote.py
index 44b7ffaa..9ebc52fe 100644
--- a/git/remote.py
+++ b/git/remote.py
@@ -5,33 +5,34 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
 # Module implementing a remote object allowing easy access to git remotes
+import re
+import os
 
-from exc import GitCommandError
-from ConfigParser import NoOptionError
-from config import SectionConstraint
-
-from git.util import (
-    LazyMixin,
-    Iterable,
-    IterableList,
-    RemoteProgress
+from .exc import GitCommandError
+from .config import (
+    SectionConstraint,
+    cp,
 )
-
-from refs import (
+from .refs import (
     Reference,
     RemoteReference,
     SymbolicReference,
     TagReference
 )
 
+
+from git.util import (
+    LazyMixin,
+    Iterable,
+    IterableList,
+    RemoteProgress
+)
 from git.util import (
     join_path,
     finalize_process
 )
 from gitdb.util import join
 
-import re
-import os
 
 __all__ = ('RemoteProgress', 'PushInfo', 'FetchInfo', 'Remote')
 
@@ -390,7 +391,7 @@ class Remote(LazyMixin, Iterable):
         # even though a slot of the same name exists
         try:
             return self._config_reader.get(attr)
-        except NoOptionError:
+        except cp.NoOptionError:
             return super(Remote, self).__getattr__(attr)
         # END handle exception