aboutsummaryrefslogtreecommitdiff
path: root/git/__init__.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-02-10 21:40:53 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-02-10 21:40:53 +0100
commit1cb02ebcaa4891c01a1d6cba11a3cd9806fad782 (patch)
tree51130c659e5089434e84404940ed1451f6c5d5cc /git/__init__.py
parent660bdca125aa9dcca7a7730535bec433edb8ba02 (diff)
parentf77230f618722e964a76657ebb03d822b2f73518 (diff)
downloadGitPython-1cb02ebcaa4891c01a1d6cba11a3cd9806fad782.tar.gz
GitPython-1cb02ebcaa4891c01a1d6cba11a3cd9806fad782.zip
Merge branch 'feature/spaces-and-cleanup-master'
* feature/spaces-and-cleanup-master: Basic fixes to get tests back on track. Of course there is much more work to be done here removed leftover gitdb - I thought it was merged into git tabs to 4 spaces - overall state of this branch is desolate, but fixable. Needs plenty of work
Diffstat (limited to 'git/__init__.py')
-rw-r--r--git/__init__.py36
1 files changed, 18 insertions, 18 deletions
diff --git a/git/__init__.py b/git/__init__.py
index adc5487e..91a10bb3 100644
--- a/git/__init__.py
+++ b/git/__init__.py
@@ -13,17 +13,17 @@ __version__ = 'git'
#{ Initialization
def _init_externals():
- """Initialize external projects by putting them into the path"""
- ext_base = os.path.join(os.path.dirname(__file__), 'ext')
- for package in ('async', 'smmap'):
- sys.path.append(os.path.join(ext_base, package))
- try:
- __import__(package)
- except ImportError:
- raise ImportError("%r could not be found in your PYTHONPATH" % package)
- #END verify import
- #END handle external import
-
+ """Initialize external projects by putting them into the path"""
+ ext_base = os.path.join(os.path.dirname(__file__), 'ext')
+ for package in ('async', 'smmap'):
+ sys.path.append(os.path.join(ext_base, package))
+ try:
+ __import__(package)
+ except ImportError:
+ raise ImportError("%r could not be found in your PYTHONPATH" % package)
+ #END verify import
+ #END handle external import
+
#} END initialization
#################
@@ -43,14 +43,14 @@ from git.remote import *
from git.index import *
from git.repo import Repo
from git.util import (
- LockFile,
- BlockingLockFile,
- Stats,
- Actor
- )
+ LockFile,
+ BlockingLockFile,
+ Stats,
+ Actor
+ )
#} END imports
__all__ = [ name for name, obj in locals().items()
- if not (name.startswith('_') or inspect.ismodule(obj)) ]
-
+ if not (name.startswith('_') or inspect.ismodule(obj)) ]
+