diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2017-09-28 15:13:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 15:13:15 +0200 |
| commit | a56136f9cb48a17ae15b59ae0f3f99d9303b1cb1 (patch) | |
| tree | ecb856bea6ed63e9c2baf8365a4e0a9030b0b3a3 /git/__init__.py | |
| parent | 90dc03da3ebe1daafd7f39d1255565b5c07757cb (diff) | |
| parent | 2af601d5800a39ab04e9fe6cf22ef7b917ab5d67 (diff) | |
| download | gitpython-a56136f9cb48a17ae15b59ae0f3f99d9303b1cb1.tar.gz | |
Merge branch 'master' into adding_setup_for_git_executable
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 4ba55305..74609e79 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 |