aboutsummaryrefslogtreecommitdiff
path: root/git/__init__.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-02-10 20:11:58 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-02-10 20:11:58 +0100
commit56d5d0c70cf3a914286fe016030c9edec25c3ae0 (patch)
tree8c2006f92a65c564227b6dc18f48507303fb4f79 /git/__init__.py
parent0b820e617ab21b372394bf12129c30174f57c5d7 (diff)
parentdbe78c02cbdfd0a539a1e04976e1480ac0daf580 (diff)
downloadGitPython-56d5d0c70cf3a914286fe016030c9edec25c3ae0.tar.gz
GitPython-56d5d0c70cf3a914286fe016030c9edec25c3ae0.zip
Merge branch 'feature/spaces-and-cleanup-0.3' into 0.3
* feature/spaces-and-cleanup-0.3: Minor modifications to get tests back to work. Two tests are failing in the latest git version, would have to dig into it Adjusted required versions of pre-requisites, now the majority of the tests work tabs to 4 spaces - this won't make integrating the patches easier, but it's probably a good idea to go a little more pep8 (and fix sins of my youth ;) )
Diffstat (limited to 'git/__init__.py')
-rw-r--r--git/__init__.py32
1 files changed, 16 insertions, 16 deletions
diff --git a/git/__init__.py b/git/__init__.py
index 0658c330..9ea81112 100644
--- a/git/__init__.py
+++ b/git/__init__.py
@@ -13,15 +13,15 @@ __version__ = 'git'
#{ Initialization
def _init_externals():
- """Initialize external projects by putting them into the path"""
- sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', 'gitdb'))
-
- try:
- import gitdb
- except ImportError:
- raise ImportError("'gitdb' could not be found in your PYTHONPATH")
- #END verify import
-
+ """Initialize external projects by putting them into the path"""
+ sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', 'gitdb'))
+
+ try:
+ import gitdb
+ except ImportError:
+ raise ImportError("'gitdb' could not be found in your PYTHONPATH")
+ #END verify import
+
#} END initialization
#################
@@ -41,14 +41,14 @@ from git.repo import Repo
from git.remote import *
from git.index import *
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)) ]
+