diff options
Diffstat (limited to 'git/refs')
| -rw-r--r-- | git/refs/__init__.py | 14 | ||||
| -rw-r--r-- | git/refs/head.py | 4 | ||||
| -rw-r--r-- | git/refs/symbolic.py | 1 |
3 files changed, 5 insertions, 14 deletions
diff --git a/git/refs/__init__.py b/git/refs/__init__.py index 0281121a..ded8b1f7 100644 --- a/git/refs/__init__.py +++ b/git/refs/__init__.py @@ -1,4 +1,4 @@ - +# flake8: noqa from __future__ import absolute_import # import all modules in order, fix the names they require from .symbolic import * @@ -7,16 +7,4 @@ from .head import * from .tag import * from .remote import * -# name fixes -from . import head -head.RemoteReference = RemoteReference -del(head) - - -from . import symbolic -for item in (HEAD, Head, RemoteReference, TagReference, Reference, SymbolicReference): - setattr(symbolic, item.__name__, item) -del(symbolic) - - from .log import * diff --git a/git/refs/head.py b/git/refs/head.py index acdd37d6..25c994a3 100644 --- a/git/refs/head.py +++ b/git/refs/head.py @@ -81,7 +81,7 @@ class HEAD(SymbolicReference): try: self.repo.git.reset(mode, commit, add_arg, paths, **kwargs) - except GitCommandError, e: + except GitCommandError as e: # git nowadays may use 1 as status to indicate there are still unstaged # modifications after the reset if e.status != 1: @@ -134,6 +134,7 @@ class Head(Reference): :param remote_reference: The remote reference to track or None to untrack any references :return: self""" + from .remote import RemoteReference if remote_reference is not None and not isinstance(remote_reference, RemoteReference): raise ValueError("Incorrect parameter type: %r" % remote_reference) # END handle type @@ -156,6 +157,7 @@ class Head(Reference): """ :return: The remote_reference we are tracking, or None if we are not a tracking branch""" + from .remote import RemoteReference reader = self.config_reader() if reader.has_option(self.k_config_remote) and reader.has_option(self.k_config_remote_ref): ref = Head(self.repo, Head.to_full_path(reader.get_value(self.k_config_remote_ref))) diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py index 2fa58d12..e0f5531a 100644 --- a/git/refs/symbolic.py +++ b/git/refs/symbolic.py @@ -625,6 +625,7 @@ class SymbolicReference(object): # Names like HEAD are inserted after the refs module is imported - we have an import dependency # cycle and don't want to import these names in-function + from . import HEAD, Head, RemoteReference, TagReference, Reference for ref_type in (HEAD, Head, RemoteReference, TagReference, Reference, SymbolicReference): try: instance = ref_type(repo, path) |