@@ -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,
 
@@ -13,14 +13,14 @@
 
 from gitdb.utils.compat import (
     xrange,
-    MAXSIZE,
-    izip,
+    MAXSIZE,    # @UnusedImport
+    izip,       # @UnusedImport
 )
 from gitdb.utils.encoding import (
-    string_types,
-    text_type,
-    force_bytes,
-    force_text
+    string_types,    # @UnusedImport
+    text_type,       # @UnusedImport
+    force_bytes,     # @UnusedImport
+    force_text       # @UnusedImport
 )
 
 
@@ -33,17 +33,21 @@
 if PY3:
     import io
     FileType = io.IOBase
+
     def byte_ord(b):
         return b
+
     def bchr(n):
         return bytes([n])
+
     def mviter(d):
         return d.values()
-    range = xrange
+
+    range = xrange  # @ReservedAssignment
     unicode = str
     binary_type = bytes
 else:
-    FileType = file
+    FileType = file  # @UndefinedVariable on PY3
     # usually, this is just ascii, which might not enough for our encoding needs
     # Unless it's set specifically, we override it to be utf-8
     if defenc == 'ascii':
@@ -52,7 +56,8 @@ def mviter(d):
     bchr = chr
     unicode = unicode
     binary_type = str
-    range = xrange
+    range = xrange  # @ReservedAssignment
+
     def mviter(d):
         return d.itervalues()
 
 
@@ -40,7 +40,7 @@
 class MetaParserBuilder(abc.ABCMeta):
 
     """Utlity class wrapping base-class methods into decorators that assure read-only properties"""
-    def __new__(metacls, name, bases, clsdict):
+    def __new__(cls, name, bases, clsdict):
         """
         Equip all base-class methods with a needs_values decorator, and all non-const methods
         with a set_dirty_and_flush_changes decorator in addition to that."""
@@ -62,7 +62,7 @@ def __new__(metacls, name, bases, clsdict):
             # END for each base
         # END if mutating methods configuration is set
 
-        new_type = super(MetaParserBuilder, metacls).__new__(metacls, name, bases, clsdict)
+        new_type = super(MetaParserBuilder, cls).__new__(cls, name, bases, clsdict)
         return new_type
 
 
 
@@ -7,7 +7,7 @@
     bin_to_hex,
     hex_to_bin
 )
-from gitdb.db import GitDB
+from gitdb.db import GitDB  # @UnusedImport
 from gitdb.db import LooseObjectDB
 
 from .exc import (
@@ -54,7 +54,7 @@ def partial_to_complete_sha_hex(self, partial_hexsha):
         :note: currently we only raise BadObject as git does not communicate
             AmbiguousObjects separately"""
         try:
-            hexsha, typename, size = self._git.get_object_header(partial_hexsha)
+            hexsha, typename, size = self._git.get_object_header(partial_hexsha)  # @UnusedVariable
             return hex_to_bin(hexsha)
         except (GitCommandError, ValueError):
             raise BadObject(partial_hexsha)
 
@@ -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 *     # NOQA
+from gitdb.exc import *     # NOQA @UnusedWildImport
 from git.compat import UnicodeMixin, safe_decode, string_types
 
 
 
@@ -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))
@@ -1102,11 +1101,11 @@ def handle_stderr(proc, iter_checked_out_files):
                 try:
                     self.entries[(co_path, 0)]
                 except KeyError:
-                    dir = co_path
-                    if not dir.endswith('/'):
-                        dir += '/'
+                    folder = co_path
+                    if not folder.endswith('/'):
+                        folder += '/'
                     for entry in mviter(self.entries):
-                        if entry.path.startswith(dir):
+                        if entry.path.startswith(folder):
                             p = entry.path
                             self._write_path_to_stdin(proc, p, p, make_exc,
                                                       fprogress, read_from_stdout=False)
 
@@ -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