Merge upstream gitpython-developers#705 & gitpython-developers#706 PRs

* github.com:gitpython-developers/GitPython:
  Remove redundant Python 2.4 code
  Specify Python 3.6 support
  Fix flake8

Author: cwonrails

Diff for: README.md

@@ -19,7 +19,7 @@ If it is not in your `PATH`, you can help GitPython find it by setting
 the `GIT_PYTHON_GIT_EXECUTABLE=<path/to/git>` environment variable.
 
 * Git (1.7.x or newer)
-* Python 2.7 to 3.5, while python 2.6 is supported on a *best-effort basis*.
+* Python 2.7 to 3.6, while python 2.6 is supported on a *best-effort basis*.
 
 The list of dependencies are listed in `./requirements.txt` and `./test-requirements.txt`.
 The installer takes care of installing them for you.
@@ -125,7 +125,7 @@ Please have a look at the [contributions file][contributing].
 
 ### How to verify a release
 
-Please only use releases from `pypi` as you can verify the respective source 
+Please only use releases from `pypi` as you can verify the respective source
 tarballs.
 
 This script shows how to verify the tarball was indeed created by the authors of

Diff for: git/repo/base.py

@@ -8,7 +8,6 @@
 import logging
 import os
 import re
-import sys
 import warnings
 
 from git.cmd import (
@@ -40,11 +39,6 @@
 
 log = logging.getLogger(__name__)
 
-DefaultDBType = GitCmdObjectDB
-if sys.version_info[:2] < (2, 5):     # python 2.4 compatibility
-    DefaultDBType = GitCmdObjectDB
-# END handle python 2.4
-
 BlameEntry = namedtuple('BlameEntry', ['commit', 'linenos', 'orig_path', 'orig_linenos'])
 
 
@@ -88,7 +82,7 @@ class Repo(object):
     # Subclasses may easily bring in their own custom types by placing a constructor or type here
     GitCommandWrapperType = Git
 
-    def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=False, expand_vars=True):
+    def __init__(self, path=None, odbt=GitCmdObjectDB, search_parent_directories=False, expand_vars=True):
         """Create a new Repo instance
 
         :param path:
@@ -869,7 +863,7 @@ def blame(self, rev, file, incremental=False, **kwargs):
         return blames
 
     @classmethod
-    def init(cls, path=None, mkdir=True, odbt=DefaultDBType, expand_vars=True, **kwargs):
+    def init(cls, path=None, mkdir=True, odbt=GitCmdObjectDB, expand_vars=True, **kwargs):
         """Initialize a git repository at the given path if specified
 
         :param path:

Diff for: setup.py

@@ -101,6 +101,7 @@ def _stamp_version(filename):
     package_data={'git.test': ['fixtures/*']},
     package_dir={'git': 'git'},
     license="BSD License",
+    python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*',
     requires=['gitdb2 (>=2.0.0)'],
     install_requires=install_requires,
     test_requirements=test_requires + install_requires,