[pypy-commit] pypy stdlib-2.7.9: Resolved merge conflicts in test_ssl.py

[alex_gaynor]

Author: Alex Gaynor <alex.gay...@gmail.com>
Branch: stdlib-2.7.9
Changeset: r74929:39a0aacf4e67
Date: 2014-12-14 10:43 -0800
http://bitbucket.org/pypy/pypy/changeset/39a0aacf4e67/

Log:    Resolved merge conflicts in test_ssl.py

diff --git a/lib-python/2.7/test/test_hash.py b/lib-python/2.7/test/test_hash.py
--- a/lib-python/2.7/test/test_hash.py
+++ b/lib-python/2.7/test/test_hash.py
@@ -222,12 +222,7 @@
     repr_ = 'buffer("abc")'
 
     def test_empty_string(self):
-<<<<<<< local
         self.assertEqual(hash(buffer("")), self.EMPTY_STRING_HASH)
-=======
-        with test_support.check_py3k_warnings():
-            self.assertEqual(hash(buffer("")), 0)
->>>>>>> other
 
 class DatetimeTests(HashRandomizationTests):
     def get_hash_command(self, repr_):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit