diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2017-09-28 15:05:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 15:05:42 +0200 |
| commit | 8ef53c53012c450adb8d5d386c207a98b0feb579 (patch) | |
| tree | 35694adabe75e7c155cf3a37f17701b8413f3ece | |
| parent | a5f034355962c5156f20b4de519aae18478b413a (diff) | |
| parent | 0b6cde8de6d40715cf445cf1a5d77cd9befbf4d0 (diff) | |
| download | gitpython-8ef53c53012c450adb8d5d386c207a98b0feb579.tar.gz | |
Merge pull request #658 from terminalmage/issue657
Fix GitError being raised in initial `import git`
| -rw-r--r-- | git/__init__.py | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/git/__init__.py b/git/__init__.py index 8c31e309..75247dbf 100644 --- a/git/__init__.py +++ b/git/__init__.py @@ -35,23 +35,26 @@ _init_externals() #{ Imports -from git.config import GitConfigParser # @NoMove @IgnorePep8 -from git.objects import * # @NoMove @IgnorePep8 -from git.refs import * # @NoMove @IgnorePep8 -from git.diff import * # @NoMove @IgnorePep8 -from git.exc import * # @NoMove @IgnorePep8 -from git.db import * # @NoMove @IgnorePep8 -from git.cmd import Git # @NoMove @IgnorePep8 -from git.repo import Repo # @NoMove @IgnorePep8 -from git.remote import * # @NoMove @IgnorePep8 -from git.index import * # @NoMove @IgnorePep8 -from git.util import ( # @NoMove @IgnorePep8 - LockFile, - BlockingLockFile, - Stats, - Actor, - rmtree, -) +from git.exc import * # @NoMove @IgnorePep8 +try: + from git.config import GitConfigParser # @NoMove @IgnorePep8 + from git.objects import * # @NoMove @IgnorePep8 + from git.refs import * # @NoMove @IgnorePep8 + from git.diff import * # @NoMove @IgnorePep8 + from git.db import * # @NoMove @IgnorePep8 + from git.cmd import Git # @NoMove @IgnorePep8 + from git.repo import Repo # @NoMove @IgnorePep8 + from git.remote import * # @NoMove @IgnorePep8 + from git.index import * # @NoMove @IgnorePep8 + from git.util import ( # @NoMove @IgnorePep8 + LockFile, + BlockingLockFile, + Stats, + Actor, + rmtree, + ) +except GitError as exc: + raise ImportError('%s: %s' % (exc.__class__.__name__, exc)) #} END imports |