Skip to content

Commit

Permalink
Revert "Replace wildcard imports with concrete imports"
Browse files Browse the repository at this point in the history
This reverts commit 53d94b8.

The reason for the revert is that the commit in question introduced a
regression where certain modules, functions and classes that were
exposed before were no longer exposed.

See #1352 (comment)
for additional information.
  • Loading branch information
trym-b authored and Byron committed Oct 3, 2021
1 parent 53d94b8 commit ce4afe4
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 32 deletions.
22 changes: 11 additions & 11 deletions git/__init__.py
Expand Up @@ -5,7 +5,7 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
# flake8: noqa
#@PydevCodeAnalysisIgnore
from git.exc import GitError, GitCommandError, GitCommandNotFound, UnmergedEntriesError, CheckoutError, InvalidGitRepositoryError, NoSuchPathError, BadName # @NoMove @IgnorePep8
from git.exc import * # @NoMove @IgnorePep8
import inspect
import os
import sys
Expand Down Expand Up @@ -39,16 +39,16 @@ def _init_externals() -> None:
#{ Imports

try:
from git.config import GitConfigParser # @NoMove @IgnorePep8
from git.objects import Blob, Commit, Object, Submodule, Tree # @NoMove @IgnorePep8
from git.refs import Head, Reference, RefLog, RemoteReference, SymbolicReference, TagReference # @NoMove @IgnorePep8
from git.diff import Diff, DiffIndex, NULL_TREE # @NoMove @IgnorePep8
from git.db import GitCmdObjectDB, GitDB # @NoMove @IgnorePep8
from git.cmd import Git # @NoMove @IgnorePep8
from git.repo import Repo # @NoMove @IgnorePep8
from git.remote import FetchInfo, PushInfo, Remote, RemoteProgress # @NoMove @IgnorePep8
from git.index import BlobFilter, IndexEntry, IndexFile # @NoMove @IgnorePep8
from git.util import ( # @NoMove @IgnorePep8
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,
Expand Down
3 changes: 2 additions & 1 deletion git/exc.py
Expand Up @@ -5,7 +5,8 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
""" Module containing all exceptions thrown throughout the git package, """

from gitdb.exc import BadName, BadObject # NOQA @UnusedWildImport skipcq: PYL-W0401, PYL-W0614
from gitdb.exc import BadName # NOQA @UnusedWildImport skipcq: PYL-W0401, PYL-W0614
from gitdb.exc import * # NOQA @UnusedWildImport skipcq: PYL-W0401, PYL-W0614
from git.compat import safe_decode

# typing ----------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions git/index/__init__.py
@@ -1,4 +1,4 @@
"""Initialize the index package"""
# flake8: noqa
from .base import IndexFile
from .typ import IndexEntry, BlobFilter
from .base import *
from .typ import *
14 changes: 7 additions & 7 deletions git/objects/__init__.py
Expand Up @@ -4,14 +4,14 @@
# flake8: noqa
import inspect

from .base import Object, IndexObject
from .blob import Blob
from .commit import Commit
from .base import *
from .blob import *
from .commit import *
from .submodule import util as smutil
from .submodule.base import Submodule, UpdateProgress
from .submodule.root import RootModule, RootUpdateProgress
from .tag import TagObject
from .tree import Tree
from .submodule.base import *
from .submodule.root import *
from .tag import *
from .tree import *
# Fix import dependency - add IndexObject to the util module, so that it can be
# imported by the submodule.base
smutil.IndexObject = IndexObject # type: ignore[attr-defined]
Expand Down
12 changes: 6 additions & 6 deletions git/refs/__init__.py
@@ -1,9 +1,9 @@
# flake8: noqa
# import all modules in order, fix the names they require
from .symbolic import SymbolicReference
from .reference import Reference
from .head import HEAD, Head
from .tag import TagReference
from .remote import RemoteReference
from .symbolic import *
from .reference import *
from .head import *
from .tag import *
from .remote import *

from .log import RefLogEntry, RefLog
from .log import *
7 changes: 2 additions & 5 deletions test/lib/__init__.py
Expand Up @@ -4,12 +4,9 @@
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php

# flake8: noqa
import inspect

from .helper import (GIT_DAEMON_PORT, SkipTest, StringProcessAdapter, TestBase,
TestCase, fixture, fixture_path,
with_rw_and_rw_remote_repo, with_rw_directory,
with_rw_repo)
from .helper import *

__all__ = [name for name, obj in locals().items()
if not (name.startswith('_') or inspect.ismodule(obj))]

0 comments on commit ce4afe4

Please sign in to comment.