Merge remote-tracking branch 'upstream/master' into tmp-unicode-path

* upstream/master:
  chore(lint): flake8 pacification
  fix(refs): handle quoted branch names
  chore(repo): remove comment
  chore(lint): flake8
  fix(submodule): don't fail if tracking branch can't be setup
  Don't change the meaning of string literals
  Fixes to support Python 2.6 again.

Author: yarikoptic

.appveyor.yml

@@ -7,6 +7,9 @@ environment:
     matrix:
         ## MINGW
         #
+      - PYTHON: "C:\\Python26"
+        PYTHON_VERSION: "2.6"
+        GIT_PATH: "%GIT_DAEMON_PATH%"
       - PYTHON: "C:\\Python27"
         PYTHON_VERSION: "2.7"
         GIT_PATH: "%GIT_DAEMON_PATH%"

.travis.yml

@@ -1,10 +1,14 @@
 language: python
 python:
+  - "2.6"
   - "2.7"
   - "3.3"
   - "3.4"
   - "3.5"
   # - "pypy" - won't work as smmap doesn't work (see gitdb/.travis.yml for details)
+#matrix:
+#  allow_failures:
+#    - python: "2.6"
 git:
   # a higher depth is needed for most of the tests - must be high enough to not actually be shallow
   # as we clone our own repository in the process
@@ -18,7 +22,8 @@ install:
   - git fetch --tags
   - pip install -r test-requirements.txt
   - pip install codecov sphinx
-  
+  - if [ "$TRAVIS_PYTHON_VERSION" == '2.6' ]; then pip install unittest2; fi
+
   - if [ ! -z "$TMPDIR" ]; then echo "Symlinking $TMPDIR"; ln -s /tmp "$TMPDIR"; fi
 
   # generate some reflog as git-python tests need it (in master)

git/cmd.py

@@ -135,13 +135,14 @@ def dict_to_slots_and__excluded_are_none(self, d, excluded=()):
 
 ## -- End Utilities -- @}
 
+
 # value of Windows process creation flag taken from MSDN
 CREATE_NO_WINDOW = 0x08000000
 
 ## CREATE_NEW_PROCESS_GROUP is needed to allow killing it afterwards,
-# seehttps://docs.python.org/3/library/subprocess.html#subprocess.Popen.send_signal
+# see https://docs.python.org/3/library/subprocess.html#subprocess.Popen.send_signal
 PROC_CREATIONFLAGS = (CREATE_NO_WINDOW | subprocess.CREATE_NEW_PROCESS_GROUP
-                      if is_win
+                      if is_win and sys.version_info >= (2, 7)
                       else 0)
 
 
@@ -245,7 +246,7 @@ def __del__(self):
                 return
 
             # can be that nothing really exists anymore ...
-            if os is None or os.kill is None:
+            if os is None or getattr(os, 'kill', None) is None:
                 return
 
             # try to kill it
@@ -831,8 +832,12 @@ 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.
-        _kwargs = {k: v for k, v in kwargs.items() if k in execute_kwargs}
-        kwargs = {k: v for k, v in kwargs.items() if k not in execute_kwargs}
+        _kwargs = dict()
+        for kwarg in execute_kwargs:
+            try:
+                _kwargs[kwarg] = kwargs.pop(kwarg)
+            except KeyError:
+                pass
 
         insert_after_this_arg = kwargs.pop('insert_kwargs_after', None)
 

git/objects/submodule/base.py

@@ -3,7 +3,10 @@
 import logging
 import os
 import stat
-from unittest.case import SkipTest
+try:
+    from unittest import SkipTest
+except ImportError:
+    from unittest2 import SkipTest
 import uuid
 
 import git
@@ -537,7 +540,7 @@ def update(self, recursive=False, init=True, to_latest_revision=False, progress=
                         # make sure HEAD is not detached
                         mrepo.head.set_reference(local_branch, logmsg="submodule: attaching head to %s" % local_branch)
                         mrepo.head.ref.set_tracking_branch(remote_branch)
-                    except IndexError:
+                    except (IndexError, InvalidGitRepositoryError):
                         log.warn("Failed to checkout tracking branch %s", self.branch_path)
                     # END handle tracking branch
 

git/objects/submodule/root.py

@@ -17,14 +17,14 @@
 
 
 class RootUpdateProgress(UpdateProgress):
-
     """Utility class which adds more opcodes to the UpdateProgress"""
     REMOVE, PATHCHANGE, BRANCHCHANGE, URLCHANGE = [
         1 << x for x in range(UpdateProgress._num_op_codes, UpdateProgress._num_op_codes + 4)]
     _num_op_codes = UpdateProgress._num_op_codes + 4
 
     __slots__ = tuple()
 
+
 BEGIN = RootUpdateProgress.BEGIN
 END = RootUpdateProgress.END
 REMOVE = RootUpdateProgress.REMOVE

git/refs/head.py

@@ -8,6 +8,12 @@
 __all__ = ["HEAD", "Head"]
 
 
+def strip_quotes(string):
+    if string.startswith('"') and string.endswith('"'):
+        return string[1:-1]
+    return string
+    
+
 class HEAD(SymbolicReference):
 
     """Special case of a Symbolic Reference as it represents the repository's
@@ -152,7 +158,7 @@ def tracking_branch(self):
         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)))
+            ref = Head(self.repo, Head.to_full_path(strip_quotes(reader.get_value(self.k_config_remote_ref))))
             remote_refpath = RemoteReference.to_full_path(join_path(reader.get_value(self.k_config_remote), ref.name))
             return RemoteReference(self.repo, remote_refpath)
         # END handle have tracking branch

git/repo/base.py

@@ -875,7 +875,7 @@ def _clone(cls, git, url, path, odb_default_type, progress, **kwargs):
         if progress:
             handle_process_output(proc, None, progress.new_message_handler(), finalize_process)
         else:
-            (stdout, stderr) = proc.communicate()  # FIXME: Will block if outputs are big!
+            (stdout, stderr) = proc.communicate()
             log.debug("Cmd(%s)'s unused stdout: %s", getattr(proc, 'args', ''), stdout)
             finalize_process(proc, stderr=stderr)
 

git/test/lib/helper.py

@@ -7,20 +7,24 @@
 
 import contextlib
 from functools import wraps
+import sys
 import io
 import logging
 import os
 import tempfile
 import textwrap
 import time
-from unittest import TestCase
-import unittest
 
-from git.compat import string_types, is_win, PY3
+from git.compat import string_types, is_win
 from git.util import rmtree, cwd
 
 import os.path as osp
+if sys.version_info[0:2] == (2, 6):
+    import unittest2 as unittest
+else:
+    import unittest
 
+TestCase = unittest.TestCase
 
 ospd = osp.dirname
 
@@ -335,8 +339,11 @@ class TestBase(TestCase):
       of the project history ( to assure tests don't fail for others ).
     """
 
-    if not PY3:
-        assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
+    # On py26, unittest2 has assertRaisesRegex
+    # On py3, unittest has assertRaisesRegex
+    # On py27, we use unittest, which names it differently:
+    if sys.version_info[0:2] == (2, 7):
+        assertRaisesRegex = TestCase.assertRaisesRegexp
 
     def _small_repo_url(self):
         """:return" a path to a small, clonable repository"""

git/test/test_base.py

@@ -7,7 +7,10 @@
 import os
 import sys
 import tempfile
-from unittest import skipIf
+try:
+    from unittest import SkipTest, skipIf
+except ImportError:
+    from unittest2 import SkipTest, skipIf
 
 from git import (
     Blob,
@@ -131,7 +134,6 @@ def test_add_unicode(self, rw_repo):
         try:
             file_path.encode(sys.getfilesystemencoding())
         except UnicodeEncodeError:
-            from unittest import SkipTest
             raise SkipTest("Environment doesn't support unicode filenames")
 
         with open(file_path, "wb") as fp:

git/test/test_fun.py

@@ -1,6 +1,9 @@
 from io import BytesIO
 from stat import S_IFDIR, S_IFREG, S_IFLNK
-from unittest.case import skipIf
+try:
+    from unittest import skipIf
+except ImportError:
+    from unittest2 import skipIf
 
 from git.compat import PY3
 from git.index import IndexFile

git/test/test_index.py

@@ -13,7 +13,10 @@
 )
 import sys
 import tempfile
-from unittest.case import skipIf
+try:
+    from unittest import skipIf
+except ImportError:
+    from unittest2 import skipIf
 
 from git import (
     IndexFile,
@@ -149,8 +152,9 @@ def add_bad_blob():
         except Exception as ex:
             msg_py3 = "required argument is not an integer"
             msg_py2 = "cannot convert argument to integer"
-            ## msg_py26 ="unsupported operand type(s) for &: 'str' and 'long'"
-            assert msg_py2 in str(ex) or msg_py3 in str(ex), str(ex)
+            msg_py26 = "unsupported operand type(s) for &: 'str' and 'long'"
+            assert msg_py2 in str(ex) or msg_py3 in str(ex) or \
+                msg_py26 in str(ex), str(ex)
 
         ## 2nd time should not fail due to stray lock file
         try:

git/test/test_refs.py

@@ -119,6 +119,17 @@ def test_heads(self, rwrepo):
             assert head.tracking_branch() == remote_ref
             head.set_tracking_branch(None)
             assert head.tracking_branch() is None
+            
+            special_name = 'feature#123'
+            special_name_remote_ref = SymbolicReference.create(rwrepo, 'refs/remotes/origin/%s' % special_name)
+            gp_tracking_branch = rwrepo.create_head('gp_tracking#123')
+            special_name_remote_ref = rwrepo.remotes[0].refs[special_name]  # get correct type
+            gp_tracking_branch.set_tracking_branch(special_name_remote_ref)
+            assert gp_tracking_branch.tracking_branch().path == special_name_remote_ref.path
+            
+            git_tracking_branch = rwrepo.create_head('git_tracking#123')
+            rwrepo.git.branch('-u', special_name_remote_ref.name, git_tracking_branch.name)
+            assert git_tracking_branch.tracking_branch().name == special_name_remote_ref.name
         # END for each head
 
         # verify REFLOG gets altered

git/test/test_remote.py

@@ -6,7 +6,10 @@
 
 import random
 import tempfile
-from unittest.case import skipIf
+try:
+    from unittest import skipIf
+except ImportError:
+    from unittest2 import skipIf
 
 from git import (
     RemoteProgress,

git/test/test_repo.py

@@ -11,7 +11,10 @@
 import pickle
 import sys
 import tempfile
-from unittest.case import skipIf
+try:
+    from unittest import skipIf, SkipTest
+except ImportError:
+    from unittest2 import skipIf, SkipTest
 
 from git import (
     InvalidGitRepositoryError,
@@ -53,7 +56,6 @@
 from git.util import HIDE_WINDOWS_KNOWN_ERRORS, cygpath
 from git.test.lib import with_rw_directory
 from git.util import join_path_native, rmtree, rmfile, bin_to_hex
-from unittest import SkipTest
 
 import functools as fnt
 import os.path as osp

git/test/test_submodule.py

@@ -3,7 +3,10 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 import os
 import sys
-from unittest.case import skipIf
+try:
+    from unittest import skipIf
+except ImportError:
+    from unittest2 import skipIf
 
 import git
 from git.cmd import Git
@@ -29,12 +32,12 @@
 
 
 class TestRootProgress(RootUpdateProgress):
-
     """Just prints messages, for now without checking the correctness of the states"""
 
     def update(self, op, cur_count, max_count, message=''):
         print(op, cur_count, max_count, message)
 
+
 prog = TestRootProgress()
 
 

git/test/test_tree.py

@@ -6,7 +6,10 @@
 
 from io import BytesIO
 import sys
-from unittest.case import skipIf
+try:
+    from unittest import skipIf
+except ImportError:
+    from unittest2 import skipIf
 
 from git import (
     Tree,

git/test/test_util.py

@@ -6,7 +6,11 @@
 
 import tempfile
 import time
-from unittest.case import skipIf
+try:
+    from unittest import skipIf
+except ImportError:
+    from unittest2 import skipIf
+
 
 import ddt
 

git/util.py

@@ -3,19 +3,21 @@
 #
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
-from __future__ import unicode_literals
-
 import contextlib
 from functools import wraps
 import getpass
 import logging
 import os
 import platform
+import subprocess
 import re
 import shutil
 import stat
 import time
-from unittest.case import SkipTest
+try:
+    from unittest import SkipTest
+except ImportError:
+    from unittest2 import SkipTest
 
 from gitdb.util import (# NOQA @IgnorePep8
     make_sha,
@@ -303,7 +305,7 @@ def is_cygwin_git(git_executable):
     if not is_win:
         return False
 
-    from subprocess import check_output
+    #from subprocess import check_output
 
     is_cygwin = _is_cygwin_cache.get(git_executable)
     if is_cygwin is None:
@@ -316,8 +318,11 @@ def is_cygwin_git(git_executable):
 
             ## Just a name given, not a real path.
             uname_cmd = osp.join(git_dir, 'uname')
-            uname = check_output(uname_cmd, universal_newlines=True)
-            is_cygwin = 'CYGWIN' in uname
+            process = subprocess.Popen([uname_cmd], stdout=subprocess.PIPE,
+                                       universal_newlines=True)
+            uname_out, _ = process.communicate()
+            #retcode = process.poll()
+            is_cygwin = 'CYGWIN' in uname_out
         except Exception as ex:
             log.debug('Failed checking if running in CYGWIN due to: %r', ex)
         _is_cygwin_cache[git_executable] = is_cygwin
@@ -940,6 +945,7 @@ class NullHandler(logging.Handler):
     def emit(self, record):
         pass
 
+
 # In Python 2.6, there is no NullHandler yet. Let's monkey-patch it for a workaround.
 if not hasattr(logging, 'NullHandler'):
     logging.NullHandler = NullHandler