VCS: Fix imports

6 files changed, 14 insertions, 22 deletions

diff --git a/ranger/ext/vcs/__init__.py b/ranger/ext/vcs/__init__.py
index a1e12a7a..b639b50f 100644
--- a/ranger/ext/vcs/__init__.py
+++ b/ranger/ext/vcs/__init__.py
@@ -1,10 +1 @@
-# -*- coding: utf-8 -*-
-# This file is part of ranger, the console file manager.
-# License: GNU GPL version 3, see the file "AUTHORS" for details.
-# Author: Abdó Roig-Maranges <abdo.roig@gmail.com>, 2011
-#
-# vcs - a python module to handle various version control systems
-
-from ranger.ext.vcs.vcs import VcsError, Vcs
-
-# vim: expandtab:shiftwidth=4:tabstop=4:softtabstop=4:textwidth=80
+"""VCS Extension Package"""
diff --git a/ranger/ext/vcs/bzr.py b/ranger/ext/vcs/bzr.py
index c8c4ff4e..2a52cf02 100644
--- a/ranger/ext/vcs/bzr.py
+++ b/ranger/ext/vcs/bzr.py
@@ -10,7 +10,7 @@ import re
 import shutil
 from datetime import datetime
 
-from ranger.ext.vcs import Vcs, VcsError
+from .vcs import Vcs, VcsError
 
 
 class Bzr(Vcs):
diff --git a/ranger/ext/vcs/git.py b/ranger/ext/vcs/git.py
index 70fcebe3..93150588 100644
--- a/ranger/ext/vcs/git.py
+++ b/ranger/ext/vcs/git.py
@@ -11,7 +11,7 @@ import shutil
 from datetime import datetime
 import json
 
-from ranger.ext.vcs import Vcs, VcsError
+from .vcs import Vcs, VcsError
 
 class Git(Vcs):
     """VCS implementation for Git"""
diff --git a/ranger/ext/vcs/hg.py b/ranger/ext/vcs/hg.py
index 35daff4a..b8731dbf 100644
--- a/ranger/ext/vcs/hg.py
+++ b/ranger/ext/vcs/hg.py
@@ -14,7 +14,7 @@ try:
 except ImportError:
     from ConfigParser import RawConfigParser
 
-from ranger.ext.vcs import Vcs, VcsError
+from .vcs import Vcs, VcsError
 
 
 class Hg(Vcs):
diff --git a/ranger/ext/vcs/svn.py b/ranger/ext/vcs/svn.py
index 78dfb8e9..9bf8698c 100644
--- a/ranger/ext/vcs/svn.py
+++ b/ranger/ext/vcs/svn.py
@@ -14,7 +14,7 @@ import re
 import shutil
 import logging
 from datetime import datetime
-from ranger.ext.vcs import Vcs, VcsError
+from .vcs import Vcs, VcsError
 
 #logging.basicConfig(filename='rangersvn.log',level=logging.DEBUG,
 #                    filemode='w')
diff --git a/ranger/ext/vcs/vcs.py b/ranger/ext/vcs/vcs.py
index 9e7d5e5b..6e092b4d 100644
--- a/ranger/ext/vcs/vcs.py
+++ b/ranger/ext/vcs/vcs.py
@@ -62,15 +62,11 @@ class Vcs(object):
     )
 
     def __init__(self, directoryobject):
-        from ranger.ext.vcs.git import Git
-        from ranger.ext.vcs.hg import Hg
-        from ranger.ext.vcs.bzr import Bzr
-        from ranger.ext.vcs.svn import SVN
         self.repotypes = {
-            'git': Git,
-            'hg': Hg,
-            'bzr': Bzr,
-            'svn': SVN,
+            'git': ranger.ext.vcs.git.Git,
+            'hg': ranger.ext.vcs.hg.Hg,
+            'bzr': ranger.ext.vcs.bzr.Bzr,
+            'svn': ranger.ext.vcs.svn.SVN,
         }
 
         self.path = directoryobject.path
@@ -334,3 +330,8 @@ class Vcs(object):
     def get_files(self, rev=None):
         """Gets a list of files in revision rev"""
         raise NotImplementedError
+
+import ranger.ext.vcs.git
+import ranger.ext.vcs.hg
+import ranger.ext.vcs.bzr
+import ranger.ext.vcs.svn