summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2011-07-05 13:42:16 +0200
committerSebastian Thiel <byronimo@gmail.com>2011-07-05 13:47:46 +0200
commitd37ef7770fbc22ce07634430d9a61516762a2724 (patch)
tree612e2f473afe462c048fcc722ca424005ae92af0 /git
parentda12df95faf27f2d69c9b69391c61b584e16614d (diff)
downloadgitpython-d37ef7770fbc22ce07634430d9a61516762a2724.tar.gz
Added smmap as submodule, package initialization adjusted to assure it is available
Diffstat (limited to 'git')
-rw-r--r--git/__init__.py16
m---------git/ext/smmap0
2 files changed, 9 insertions, 7 deletions
diff --git a/git/__init__.py b/git/__init__.py
index 4a4200cc..adc5487e 100644
--- a/git/__init__.py
+++ b/git/__init__.py
@@ -14,13 +14,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', 'async'))
-
- try:
- import async
- except ImportError:
- raise ImportError("'async' could not be found in your PYTHONPATH")
- #END verify import
+ 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
diff --git a/git/ext/smmap b/git/ext/smmap
new file mode 160000
+Subproject cf297b7b81bc5f6011c49d818d776ed7915fa1e