Removed unnecessary (non-gitpython) tests and fixed flake8

Byron · Byron · commit 1de8af907dbc · 2015-01-04T16:07:02.000+01:00
diff --git a/git/__init__.py b/git/__init__.py
@@ -3,6 +3,7 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
+# flake8: noqa
 
 import os
 import sys
diff --git a/git/exc.py b/git/exc.py
@@ -5,7 +5,7 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 """ Module containing all exceptions thrown througout the git package, """
 
-from gitdb.exc import *
+from gitdb.exc import *     # NOQA
 
 
 class InvalidGitRepositoryError(Exception):
diff --git a/git/index/__init__.py b/git/index/__init__.py
@@ -1,5 +1,5 @@
 """Initialize the index package"""
-
+# flake8: noqa
 from __future__ import absolute_import
 
 from .base import *
diff --git a/git/objects/__init__.py b/git/objects/__init__.py
@@ -1,6 +1,7 @@
 """
 Import all submodules main classes into the package space
 """
+# flake8: noqa
 from __future__ import absolute_import
 import inspect
 from .base import *
diff --git a/git/objects/blob.py b/git/objects/blob.py
@@ -17,9 +17,9 @@ class Blob(base.IndexObject):
     type = "blob"
 
     # valid blob modes
-    executable_mode = 0100755
-    file_mode = 0100644
-    link_mode = 0120000
+    executable_mode = 0o100755
+    file_mode = 0o100644
+    link_mode = 0o120000
 
     __slots__ = tuple()
 
diff --git a/git/objects/tree.py b/git/objects/tree.py
@@ -119,10 +119,10 @@ class Tree(IndexObject, diff.Diffable, util.Traversable, util.Serializable):
     __slots__ = "_cache"
 
     # actual integer ids for comparison
-    commit_id = 016     # equals stat.S_IFDIR | stat.S_IFLNK - a directory link
-    blob_id = 010
-    symlink_id = 012
-    tree_id = 004
+    commit_id = 0o16     # equals stat.S_IFDIR | stat.S_IFLNK - a directory link
+    blob_id = 0o10
+    symlink_id = 0o12
+    tree_id = 0o04
 
     _map_id_to_type = {
         commit_id: Submodule,
diff --git 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 .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
@@ -81,7 +81,7 @@ def reset(self, commit='HEAD', index=True, working_tree=False,
 
         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 @@ def set_tracking_branch(self, remote_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 @@ def tracking_branch(self):
         """
         :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
@@ -625,6 +625,7 @@ def from_path(cls, repo, path):
 
         # 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)
diff --git a/git/repo/__init__.py b/git/repo/__init__.py
@@ -1,3 +1,4 @@
 """Initialize the Repo package"""
+# flake8: noqa
 from __future__ import absolute_import
 from .base import *
diff --git a/git/repo/base.py b/git/repo/base.py
@@ -6,13 +6,22 @@
 
 from git.exc import InvalidGitRepositoryError, NoSuchPathError
 from git.cmd import Git
+from git.refs import (
+    HEAD,
+    Head,
+    Reference,
+    TagReference,
+)
+from git.objects import (
+    Submodule,
+    RootModule,
+    Commit
+)
 from git.util import (
     Actor,
     finalize_process
 )
-from git.refs import *
 from git.index import IndexFile
-from git.objects import *
 from git.config import GitConfigParser
 from git.remote import (
     Remote,
@@ -659,7 +668,7 @@ def init(cls, path=None, mkdir=True, **kwargs):
         :return: ``git.Repo`` (the newly created repo)"""
 
         if mkdir and path and not os.path.exists(path):
-            os.makedirs(path, 0755)
+            os.makedirs(path, 0o755)
 
         # git command automatically chdir into the directory
         git = Git(path)
diff --git a/git/test/lib/__init__.py b/git/test/lib/__init__.py
@@ -4,6 +4,7 @@
 # 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 .asserts import *
 from .helper import *
diff --git a/git/test/performance/test_utils.py b/git/test/performance/test_utils.py
diff --git a/git/util.py b/git/util.py
@@ -19,7 +19,7 @@
 
 # Most of these are unused here, but are for use by git-python modules so these
 # don't see gitdb all the time. Flake of course doesn't like it.
-from gitdb.util import (
+from gitdb.util import (  # NOQA
     make_sha,
     LockedFD,
     file_contents_ro,
@@ -84,14 +84,13 @@ def join_path(a, *p):
     return path
 
 
-def to_native_path_windows(path):
-    return path.replace('/', '\\')
-
+if sys.platform.startswith('win'):
+    def to_native_path_windows(path):
+        return path.replace('/', '\\')
 
-def to_native_path_linux(path):
-    return path.replace('\\', '/')
+    def to_native_path_linux(path):
+        return path.replace('\\', '/')
 
-if sys.platform.startswith('win'):
     to_native_path = to_native_path_windows
 else:
     # no need for any work on linux
diff --git a/tox.ini b/tox.ini
@@ -17,6 +17,8 @@ commands = {posargs}
 
 [flake8]
 #show-source = True
-ignore = E265,F403
+#E265 = it can't deal with my #{ section sections
+#F403 = from module import * in __init__
+ignore = E265
 max-line-length = 120
 exclude = .tox,.venv,build,dist,doc,git/ext/

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# This module is part of GitPython and is released under`
`5`	`5`	`# the BSD License: http://www.opensource.org/licenses/bsd-license.php`
	`6`	`+# flake8: noqa`
`6`	`7`
`7`	`8`	`import os`
`8`	`9`	`import sys`