@@ -42,8 +42,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'GitPython'
-copyright = u'Copyright (C) 2008, 2009 Michael Trier and contributors, 2010-2015 Sebastian Thiel'
+project = 'GitPython'
+copyright = 'Copyright (C) 2008, 2009 Michael Trier and contributors, 2010-2015 Sebastian Thiel'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -174,8 +174,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
 latex_documents = [
-  ('index', 'GitPython.tex', ur'GitPython Documentation',
-   ur'Michael Trier', 'manual'),
+  ('index', 'GitPython.tex', r'GitPython Documentation',
+   r'Michael Trier', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 
@@ -55,5 +55,5 @@ def _init_externals():
 
 #} END imports
 
-__all__ = [name for name, obj in locals().items()
+__all__ = [name for name, obj in list(locals().items())
            if not (name.startswith('_') or inspect.ismodule(obj))]
@@ -24,7 +24,7 @@
     force_bytes,
     PY3,
     # just to satisfy flake8 on py3
-    unicode,
+    str,
     safe_decode,
     is_posix,
     is_win,
@@ -128,7 +128,7 @@ def slots_to_dict(self, exclude=()):
 
 
 def dict_to_slots_and__excluded_are_none(self, d, excluded=()):
-    for k, v in d.items():
+    for k, v in list(d.items()):
         setattr(self, k, v)
     for k in excluded:
         setattr(self, k, None)
@@ -381,7 +381,7 @@ def readlines(self, size=-1):
         def __iter__(self):
             return self
 
-        def next(self):
+        def __next__(self):
             line = self.readline()
             if not line:
                 raise StopIteration
@@ -714,7 +714,7 @@ def update_environment(self, **kwargs):
         :return: dict that maps environment variables to their old values
         """
         old_env = {}
-        for key, value in kwargs.items():
+        for key, value in list(kwargs.items()):
             # set value if it is None
             if value is not None:
                 old_env[key] = self._environment.get(key)
@@ -763,8 +763,8 @@ def transform_kwarg(self, name, value, split_single_char_options):
     def transform_kwargs(self, split_single_char_options=True, **kwargs):
         """Transforms Python style kwargs into git command line options."""
         args = list()
-        kwargs = OrderedDict(sorted(kwargs.items(), key=lambda x: x[0]))
-        for k, v in kwargs.items():
+        kwargs = OrderedDict(sorted(list(kwargs.items()), key=lambda x: x[0]))
+        for k, v in list(kwargs.items()):
             if isinstance(v, (list, tuple)):
                 for value in v:
                     args += self.transform_kwarg(k, value, split_single_char_options)
@@ -777,15 +777,15 @@ def __unpack_args(cls, arg_list):
         if not isinstance(arg_list, (list, tuple)):
             # This is just required for unicode conversion, as subprocess can't handle it
             # However, in any other case, passing strings (usually utf-8 encoded) is totally fine
-            if not PY3 and isinstance(arg_list, unicode):
+            if not PY3 and isinstance(arg_list, str):
                 return [arg_list.encode(defenc)]
             return [str(arg_list)]
 
         outlist = list()
         for arg in arg_list:
             if isinstance(arg_list, (list, tuple)):
                 outlist.extend(cls.__unpack_args(arg))
-            elif not PY3 and isinstance(arg_list, unicode):
+            elif not PY3 and isinstance(arg_list, str):
                 outlist.append(arg_list.encode(defenc))
             # END recursion
             else:
@@ -840,8 +840,8 @@ def _call_process(self, method, *args, **kwargs):
         :return: Same as ``execute``"""
         # Handle optional arguments prior to calling transform_kwargs
         # otherwise these'll end up in args, which is bad.
-        exec_kwargs = dict((k, v) for k, v in kwargs.items() if k in execute_kwargs)
-        opts_kwargs = dict((k, v) for k, v in kwargs.items() if k not in execute_kwargs)
+        exec_kwargs = dict((k, v) for k, v in list(kwargs.items()) if k in execute_kwargs)
+        opts_kwargs = dict((k, v) for k, v in list(kwargs.items()) if k not in execute_kwargs)
 
         insert_after_this_arg = opts_kwargs.pop('insert_kwargs_after', None)
 
 
@@ -43,10 +43,10 @@ def bchr(n):
         return bytes([n])
 
     def mviter(d):
-        return d.values()
+        return list(d.values())
 
     range = xrange  # @ReservedAssignment
-    unicode = str
+    str = str
     binary_type = bytes
 else:
     FileType = file  # @UndefinedVariable on PY3
@@ -56,17 +56,17 @@ def mviter(d):
         defenc = 'utf-8'
     byte_ord = ord
     bchr = chr
-    unicode = unicode
+    str = str
     binary_type = str
     range = xrange  # @ReservedAssignment
 
     def mviter(d):
-        return d.itervalues()
+        return iter(d.values())
 
 
 def safe_decode(s):
     """Safely decodes a binary string to unicode"""
-    if isinstance(s, unicode):
+    if isinstance(s, str):
         return s
     elif isinstance(s, bytes):
         return s.decode(defenc, 'surrogateescape')
@@ -76,7 +76,7 @@ def safe_decode(s):
 
 def safe_encode(s):
     """Safely decodes a binary string to unicode"""
-    if isinstance(s, unicode):
+    if isinstance(s, str):
         return s.encode(defenc)
     elif isinstance(s, bytes):
         return s
@@ -86,7 +86,7 @@ def safe_encode(s):
 
 def win_encode(s):
     """Encode unicodes for process arguments on Windows."""
-    if isinstance(s, unicode):
+    if isinstance(s, str):
         return s.encode(locale.getpreferredencoding(False))
     elif isinstance(s, bytes):
         return s
@@ -155,7 +155,7 @@ def b(data):
     _unichr = chr
     bytes_chr = lambda code: bytes((code,))
 else:
-    _unichr = unichr
+    _unichr = chr
     bytes_chr = chr
 
 def surrogateescape_handler(exc):
 
@@ -28,7 +28,7 @@
 
 
 try:
-    import ConfigParser as cp
+    import configparser as cp
 except ImportError:
     # PY3
     import configparser as cp
@@ -441,15 +441,15 @@ def _write(self, fp):
         git compatible format"""
         def write_section(name, section_dict):
             fp.write(("[%s]\n" % name).encode(defenc))
-            for (key, value) in section_dict.items():
+            for (key, value) in list(section_dict.items()):
                 if key != "__name__":
                     fp.write(("\t%s = %s\n" % (key, self._value_to_string(value).replace('\n', '\n\t'))).encode(defenc))
                 # END if key is not __name__
         # END section writing
 
         if self._defaults:
             write_section(cp.DEFAULTSECT, self._defaults)
-        for name, value in self._sections.items():
+        for name, value in list(self._sections.items()):
             write_section(name, value)
 
     def items(self, section_name):
 
@@ -31,7 +31,7 @@ class CommandError(UnicodeMixin, Exception):
     #: A unicode print-format with 2 `%s for `<cmdline>` and the rest,
     #:  e.g.
     #:     u"'%s' failed%s"
-    _msg = u"Cmd('%s') failed%s"
+    _msg = "Cmd('%s') failed%s"
 
     def __init__(self, command, status=None, stderr=None, stdout=None):
         if not isinstance(command, (tuple, list)):
@@ -40,19 +40,19 @@ def __init__(self, command, status=None, stderr=None, stdout=None):
         self.status = status
         if status:
             if isinstance(status, Exception):
-                status = u"%s('%s')" % (type(status).__name__, safe_decode(str(status)))
+                status = "%s('%s')" % (type(status).__name__, safe_decode(str(status)))
             else:
                 try:
-                    status = u'exit code(%s)' % int(status)
+                    status = 'exit code(%s)' % int(status)
                 except:
                     s = safe_decode(str(status))
-                    status = u"'%s'" % s if isinstance(status, string_types) else s
+                    status = "'%s'" % s if isinstance(status, string_types) else s
 
         self._cmd = safe_decode(command[0])
-        self._cmdline = u' '.join(safe_decode(i) for i in command)
-        self._cause = status and u" due to: %s" % status or "!"
-        self.stdout = stdout and u"\n  stdout: '%s'" % safe_decode(stdout) or ''
-        self.stderr = stderr and u"\n  stderr: '%s'" % safe_decode(stderr) or ''
+        self._cmdline = ' '.join(safe_decode(i) for i in command)
+        self._cause = status and " due to: %s" % status or "!"
+        self.stdout = stdout and "\n  stdout: '%s'" % safe_decode(stdout) or ''
+        self.stderr = stderr and "\n  stderr: '%s'" % safe_decode(stderr) or ''
 
     def __unicode__(self):
         return (self._msg + "\n  cmdline: %s%s%s") % (
@@ -64,7 +64,7 @@ class GitCommandNotFound(CommandError):
     the GIT_PYTHON_GIT_EXECUTABLE environment variable"""
     def __init__(self, command, cause):
         super(GitCommandNotFound, self).__init__(command, cause)
-        self._msg = u"Cmd('%s') not found%s"
+        self._msg = "Cmd('%s') not found%s"
 
 
 class GitCommandError(CommandError):
@@ -114,7 +114,7 @@ class HookExecutionError(CommandError):
 
     def __init__(self, command, status, stderr=None, stdout=None):
         super(HookExecutionError, self).__init__(command, status, stderr, stdout)
-        self._msg = u"Hook('%s') failed%s"
+        self._msg = "Hook('%s') failed%s"
 
 
 class RepositoryDirtyError(Exception):
 
@@ -1,6 +1,6 @@
 """Initialize the index package"""
 # flake8: noqa
-from __future__ import absolute_import
+
 
 from .base import *
 from .typ import *
@@ -171,7 +171,7 @@ def _deserialize(self, stream):
 
     def _entries_sorted(self):
         """:return: list of entries, in a sorted fashion, first by path, then by stage"""
-        return sorted(self.entries.values(), key=lambda e: (e.path, e.stage))
+        return sorted(list(self.entries.values()), key=lambda e: (e.path, e.stage))
 
     def _serialize(self, stream, ignore_extension_data=False):
         entries = self._entries_sorted()
@@ -280,7 +280,7 @@ def new(cls, repo, *tree_sha):
 
         inst = cls(repo)
         # convert to entries dict
-        entries = dict(izip(((e.path, e.stage) for e in base_entries),
+        entries = dict(zip(((e.path, e.stage) for e in base_entries),
                             (IndexEntry.from_base(e) for e in base_entries)))
 
         inst.entries = entries
@@ -915,7 +915,7 @@ def move(self, items, skip_errors=False, **kwargs):
 
         # parse result - first 0:n/2 lines are 'checking ', the remaining ones
         # are the 'renaming' ones which we parse
-        for ln in xrange(int(len(mvlines) / 2), len(mvlines)):
+        for ln in range(int(len(mvlines) / 2), len(mvlines)):
             tokens = mvlines[ln].split(' to ')
             assert len(tokens) == 2, "Too many tokens in %s" % mvlines[ln]
 
 
@@ -2,7 +2,7 @@
 Import all submodules main classes into the package space
 """
 # flake8: noqa
-from __future__ import absolute_import
+
 
 import inspect
 
@@ -22,5 +22,5 @@
 
 # must come after submodule was made available
 
-__all__ = [name for name, obj in locals().items()
+__all__ = [name for name, obj in list(locals().items())
            if not (name.startswith('_') or inspect.ismodule(obj))]
@@ -22,7 +22,7 @@ def tree_to_stream(entries, write):
 
     for binsha, mode, name in entries:
         mode_str = b''
-        for i in xrange(6):
+        for i in range(6):
             mode_str = bchr(((mode >> (i * 3)) & bit_mask) + ord_zero) + mode_str
         # END for each 8 octal value