diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2011-06-07 21:36:42 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2011-06-07 21:36:42 +0200 |
| commit | 58a930a632c867b65b9a3802e2f4190cf32e33ee (patch) | |
| tree | 95b1311a3a4bfcdf4c2dba66f360e6985184013e /git/__init__.py | |
| parent | a98e0af511b728030c12bf8633b077866bb74e47 (diff) | |
| parent | f6897c78be5a5530129df50742cb6cabfb8609c9 (diff) | |
| download | GitPython-58a930a632c867b65b9a3802e2f4190cf32e33ee.tar.gz GitPython-58a930a632c867b65b9a3802e2f4190cf32e33ee.zip | |
Merge branch 'gitdbmerger'
Diffstat (limited to 'git/__init__.py')
| -rw-r--r-- | git/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git/__init__.py b/git/__init__.py index 0658c330..4a4200cc 100644 --- a/git/__init__.py +++ b/git/__init__.py @@ -14,12 +14,12 @@ __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')) + sys.path.append(os.path.join(os.path.dirname(__file__), 'ext', 'async')) try: - import gitdb + import async except ImportError: - raise ImportError("'gitdb' could not be found in your PYTHONPATH") + raise ImportError("'async' could not be found in your PYTHONPATH") #END verify import #} END initialization @@ -37,9 +37,9 @@ from git.diff import * from git.exc import * from git.db import * from git.cmd import Git -from git.repo import Repo from git.remote import * from git.index import * +from git.repo import Repo from git.util import ( LockFile, BlockingLockFile, |