diff options
| author | Erik Johnson <palehose@gmail.com> | 2017-08-10 16:09:35 -0500 |
|---|---|---|
| committer | Erik Johnson <palehose@gmail.com> | 2017-08-10 16:09:35 -0500 |
| commit | 0b6cde8de6d40715cf445cf1a5d77cd9befbf4d0 (patch) | |
| tree | 3743bb3544e4597c3882fcb96a62729591f84fc3 /git/__init__.py | |
| parent | cf8dc259fcc9c1397ea67cec3a6a4cb5816e3e68 (diff) | |
| download | gitpython-0b6cde8de6d40715cf445cf1a5d77cd9befbf4d0.tar.gz | |
Fix GitError being raised in initial `import git`
This catches any raise of one of the custom exceptions defined in
`git.exc` during the imports in the dunder init, and raises an
`ImportError` in those cases.
Diffstat (limited to 'git/__init__.py')
| -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 |