Replace six with the current version which passes checklicenses.py.

third_party/six/test_six.py

+# Copyright (c) 2010-2015 Benjamin Peterson
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
 import operator
 import sys
 import types
 import unittest
 
 import py
 
 import six
 
 
@@ skipping 372 matching lines @@
         def with_kw(*args, **kw):
             record.append(kw["kw"])
             return old(*args)
         old = getattr(MyDict, stock_method_name(name))
         monkeypatch.setattr(MyDict, stock_method_name(name), with_kw)
         meth(d, kw=42)
         assert record == [42]
         monkeypatch.undo()
 
 
-@py.test.mark.skipif(sys.version_info[:2] < (2, 7),
+@py.test.mark.skipif("sys.version_info[:2] < (2, 7)",
                 reason="view methods on dictionaries only available on 2.7+")
 def test_dictionary_views():
     def stock_method_name(viewwhat):
         """Given a method suffix like "keys" or "values", return the name
         of the dict method that delivers those on the version of Python
         we're running in."""
         if six.PY3:
             return viewwhat
         return 'view' + viewwhat
 
@@ skipping 45 matching lines @@
     class X(object):
         pass
     def f(self):
         return self
     x = X()
     b = six.create_bound_method(f, x)
     assert isinstance(b, types.MethodType)
     assert b() is x
 
 
+def test_create_unbound_method():
+    class X(object):
+        pass
+
+    def f(self):
+        return self
+    u = six.create_unbound_method(f, X)
+    py.test.raises(TypeError, u)
+    if six.PY2:
+        assert isinstance(u, types.MethodType)
+    x = X()
+    assert f(x) is x
+
+
 if six.PY3:
 
     def test_b():
         data = six.b("\xff")
         assert isinstance(data, bytes)
         assert len(data) == 1
         assert data == bytes([255])
 
 
     def test_u():
@@ skipping 21 matching lines @@
     assert len(s) == 1
 
 
 def test_unichr():
     assert six.u("\u1234") == six.unichr(0x1234)
     assert type(six.u("\u1234")) is type(six.unichr(0x1234))
 
 
 def test_int2byte():
     assert six.int2byte(3) == six.b("\x03")
-    py.test.raises((OverflowError, ValueError), six.int2byte, 256)
+    py.test.raises(Exception, six.int2byte, 256)
 
 
 def test_byte2int():
     assert six.byte2int(six.b("\x03")) == 3
     assert six.byte2int(six.b("\x03\x04")) == 3
     py.test.raises(IndexError, six.byte2int, six.b(""))
 
 
 def test_bytesindex():
     assert six.indexbytes(six.b("hello"), 3) == ord("l")
@@ skipping 281 matching lines @@
     instance.ab = "foo"
     py.test.raises(AttributeError, setattr, instance, "a", "baz")
     py.test.raises(AttributeError, setattr, instance, "b", "baz")
 
     class MySlotsWeakref(object):
         __slots__ = "__weakref__",
     MySlotsWeakref = six.add_metaclass(Meta)(MySlotsWeakref)
     assert type(MySlotsWeakref) is Meta
 
 
-@py.test.mark.skipif("sys.version_info[:2] < (2, 7)")
+@py.test.mark.skipif("sys.version_info[:2] < (2, 7) or sys.version_info[:2] in ((3, 0), (3, 1))")
 def test_assertCountEqual():
     class TestAssertCountEqual(unittest.TestCase):
         def test(self):
             with self.assertRaises(AssertionError):
                 six.assertCountEqual(self, (1, 2), [3, 4, 5])
 
             six.assertCountEqual(self, (1, 2), [2, 1])
 
     TestAssertCountEqual('test').test()
 
@@ skipping 36 matching lines @@
     my_test = MyTest()
 
     if six.PY2:
         assert str(my_test) == six.b("hello")
         assert unicode(my_test) == six.u("hello")
     elif six.PY3:
         assert bytes(my_test) == six.b("hello")
         assert str(my_test) == six.u("hello")
 
     assert getattr(six.moves.builtins, 'bytes', str)(my_test) == six.b("hello")