diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2017-09-28 15:17:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 15:17:25 +0200 |
| commit | 58998fb2dd6a1cad5faffdc36ae536ee6b04e3d2 (patch) | |
| tree | 4f5c342b1c20b23a5bc73eb74855c4bb81f2c197 /git/__init__.py | |
| parent | 251128d41cdf39a49468ed5d997cc1640339ccbc (diff) | |
| parent | 2af601d5800a39ab04e9fe6cf22ef7b917ab5d67 (diff) | |
| download | gitpython-58998fb2dd6a1cad5faffdc36ae536ee6b04e3d2.tar.gz | |
Merge branch 'master' into master
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 |