@@ -4,7 +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
-
+#@PydevCodeAnalysisIgnore
 import os
 import sys
 import inspect
@@ -32,17 +32,17 @@ def _init_externals():
 
 #{ Imports
 
-from git.config import GitConfigParser
-from git.objects import *
-from git.refs import *
-from git.diff import *
-from git.exc import *
-from git.db import *
-from git.cmd import Git
-from git.repo import Repo
-from git.remote import *
-from git.index import *
-from git.util import (
+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,
 
@@ -170,7 +170,7 @@ def _delete_entries_cache(self):
 
     def _deserialize(self, stream):
         """Initialize this instance with index values read from the given stream"""
-        self.version, self.entries, self._extension_data, conten_sha = read_cache(stream)
+        self.version, self.entries, self._extension_data, conten_sha = read_cache(stream)  # @UnusedVariable
         return self
 
     def _entries_sorted(self):
@@ -404,7 +404,7 @@ def raise_exc(e):
                     continue
             # END glob handling
             try:
-                for root, dirs, files in os.walk(abs_path, onerror=raise_exc):
+                for root, dirs, files in os.walk(abs_path, onerror=raise_exc):  # @UnusedVariable
                     for rela_file in files:
                         # add relative paths only
                         yield os.path.join(root.replace(rs, ''), rela_file)
@@ -599,7 +599,6 @@ def _store_path(self, filepath, fprogress):
         """Store file at filepath in the database and return the base index entry
         Needs the git_working_dir decorator active ! This must be assured in the calling code"""
         st = os.lstat(filepath)     # handles non-symlinks as well
-        stream = None
         if S_ISLNK(st.st_mode):
             # in PY3, readlink is string, but we need bytes. In PY2, it's just OS encoded bytes, we assume UTF-8
             open_stream = lambda: BytesIO(force_bytes(os.readlink(filepath), encoding=defenc))
 
@@ -264,7 +264,7 @@ def write_tree_from_cache(entries, odb, sl, si=0):
 
             # enter recursion
             # ci - 1 as we want to count our current item as well
-            sha, tree_entry_list = write_tree_from_cache(entries, odb, slice(ci - 1, xi), rbound + 1)
+            sha, tree_entry_list = write_tree_from_cache(entries, odb, slice(ci - 1, xi), rbound + 1)  # @UnusedVariable
             tree_items_append((sha, S_IFDIR, base))
 
             # skip ahead
 
@@ -3,22 +3,24 @@
 """
 # flake8: noqa
 from __future__ import absolute_import
+
 import inspect
+
 from .base import *
+from .blob import *
+from .commit import *
+from .submodule import util as smutil
+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
-from .submodule import util as smutil
 smutil.IndexObject = IndexObject
 smutil.Object = Object
 del(smutil)
-from .submodule.base import *
-from .submodule.root import *
 
 # must come after submodule was made available
-from .tag import *
-from .blob import *
-from .commit import *
-from .tree import *
 
 __all__ = [name for name, obj in locals().items()
            if not (name.startswith('_') or inspect.ismodule(obj))]
@@ -40,7 +40,7 @@ def __init__(self, repo, binsha):
         assert len(binsha) == 20, "Require 20 byte binary sha, got %r, len = %i" % (binsha, len(binsha))
 
     @classmethod
-    def new(cls, repo, id):
+    def new(cls, repo, id):  # @ReservedAssignment
         """
         :return: New Object instance of a type appropriate to the object type behind
             id. The id of the newly created object will be a binsha even though
 
@@ -140,7 +140,7 @@ def _get_intermediate_items(cls, commit):
     def _set_cache_(self, attr):
         if attr in Commit.__slots__:
             # read the data in a chunk, its faster - then provide a file wrapper
-            binsha, typename, self.size, stream = self.repo.odb.stream(self.binsha)
+            binsha, typename, self.size, stream = self.repo.odb.stream(self.binsha)  # @UnusedVariable
             self._deserialize(BytesIO(stream.read()))
         else:
             super(Commit, self)._set_cache_(attr)
@@ -267,7 +267,7 @@ def _iter_from_process_or_stream(cls, repo, proc_or_stream):
             hexsha = line.strip()
             if len(hexsha) > 40:
                 # split additional information, as returned by bisect for instance
-                hexsha, rest = line.split(None, 1)
+                hexsha, _ = line.split(None, 1)
             # END handle extra info
 
             assert len(hexsha) == 40, "Invalid line: %s" % hexsha
 
@@ -50,7 +50,7 @@ def __str__(self):
 
     #{ Interface
 
-    def set_object(self, object, logmsg=None):
+    def set_object(self, object, logmsg=None):  # @ReservedAssignment
         """Special version which checks if the head-log needs an update as well
         :return: self"""
         oldbinsha = None
 
@@ -218,7 +218,7 @@ def set_commit(self, commit, logmsg=None):
 
         return self
 
-    def set_object(self, object, logmsg=None):
+    def set_object(self, object, logmsg=None):  # @ReservedAssignment
         """Set the object we point to, possibly dereference our symbolic reference first.
         If the reference does not exist, it will be created
 
@@ -229,7 +229,7 @@ def set_object(self, object, logmsg=None):
         :note: plain SymbolicReferences may not actually point to objects by convention
         :return: self"""
         if isinstance(object, SymbolicReference):
-            object = object.object
+            object = object.object  # @ReservedAssignment
         # END resolve references
 
         is_detached = True
 
@@ -284,7 +284,7 @@ def rev_parse(repo, rev):
         try:
             if token == "~":
                 obj = to_commit(obj)
-                for item in xrange(num):
+                for _ in xrange(num):
                     obj = obj.parents[0]
                 # END for each history item to walk
             elif token == "^":
 
@@ -8,18 +8,18 @@
 import stat
 
 from nose.tools import (
-    assert_equal,
-    assert_not_equal,
-    assert_raises,
-    raises,
-    assert_true,
-    assert_false
+    assert_equal,       # @UnusedImport
+    assert_not_equal,   # @UnusedImport
+    assert_raises,      # @UnusedImport
+    raises,             # @UnusedImport
+    assert_true,        # @UnusedImport
+    assert_false        # @UnusedImport
 )
 
 try:
     from unittest.mock import patch
 except ImportError:
-    from mock import patch
+    from mock import patch  # @NoMove @UnusedImport
 
 __all__ = ['assert_instance_of', 'assert_not_instance_of',
            'assert_none', 'assert_not_none',