[Python-modules-commits] r23720 - in packages/simplejson/trunk/debian (5 files)

[piotr at users.alioth.debian.org]

    Date: Monday, March 18, 2013 @ 20:38:01
  Author: piotr
Revision: 23720

* New upstream release
* Add support_pydebug_interpreters_in_tests patch
  - bump minimum required Python version to 2.6
    (due to test.test_support.strip_python_stderr)

Added:
  packages/simplejson/trunk/debian/patches/
  packages/simplejson/trunk/debian/patches/series
  packages/simplejson/trunk/debian/patches/support_pydebug_interpreters_in_tests.patch
Modified:
  packages/simplejson/trunk/debian/changelog
  packages/simplejson/trunk/debian/control

Modified: packages/simplejson/trunk/debian/changelog
===================================================================
--- packages/simplejson/trunk/debian/changelog	2013-03-18 10:42:02 UTC (rev 23719)
+++ packages/simplejson/trunk/debian/changelog	2013-03-18 20:38:01 UTC (rev 23720)
@@ -1,4 +1,4 @@
-simplejson (3.0.7-1) UNRELEASED; urgency=low
+simplejson (3.1.0-1) experimental; urgency=low
 
   * New upstream release
   * New binary packages:
@@ -9,6 +9,9 @@
     - pypy-simplejson
   * Build depend on python3-all-d{ev,bg} and pypy (for new packages)
   * Rewrite debian/rules to use dh sequencer and pybuild build system
+  * Add support_pydebug_interpreters_in_tests patch
+    - bump minimum required Python version to 2.6
+      (due to test.test_support.strip_python_stderr)
 
  -- Piotr Ożarowski <piotr at debian.org>  Thu, 03 Jan 2013 20:54:07 +0100
 

Modified: packages/simplejson/trunk/debian/control
===================================================================
--- packages/simplejson/trunk/debian/control	2013-03-18 10:42:02 UTC (rev 23719)
+++ packages/simplejson/trunk/debian/control	2013-03-18 20:38:01 UTC (rev 23720)
@@ -8,7 +8,7 @@
  python-all-dev, python-all-dbg, pypy,
  python3-all-dev (>= 3.3.0-3), python3-all-dbg
 Homepage: http://undefined.org/python/#simplejson
-X-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/simplejson/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/simplejson/trunk/

Added: packages/simplejson/trunk/debian/patches/series
===================================================================
--- packages/simplejson/trunk/debian/patches/series	                        (rev 0)
+++ packages/simplejson/trunk/debian/patches/series	2013-03-18 20:38:01 UTC (rev 23720)
@@ -0,0 +1 @@
+support_pydebug_interpreters_in_tests.patch

Added: packages/simplejson/trunk/debian/patches/support_pydebug_interpreters_in_tests.patch
===================================================================
--- packages/simplejson/trunk/debian/patches/support_pydebug_interpreters_in_tests.patch	                        (rev 0)
+++ packages/simplejson/trunk/debian/patches/support_pydebug_interpreters_in_tests.patch	2013-03-18 20:38:01 UTC (rev 23720)
@@ -0,0 +1,29 @@
+# ignore "[\d+ refs]" in debug interpreters
+#
+# test.support.strip_python_stderr requires Python >= 3.2
+# test.test_support.strip_python_stderr requires Python >= 2.6, << 3.0
+Index: simplejson-3.1.0/simplejson/tests/test_tool.py
+===================================================================
+--- simplejson-3.1.0.orig/simplejson/tests/test_tool.py
++++ simplejson-3.1.0/simplejson/tests/test_tool.py
+@@ -6,6 +6,12 @@ import unittest
+ import subprocess
+ import tempfile
+ 
++try:
++    from test.support import strip_python_stderr
++except ImportError:  # Python 2.X
++    from test.test_support import strip_python_stderr
++
++
+ class TestTool(unittest.TestCase):
+     data = """
+ 
+@@ -46,6 +52,7 @@ class TestTool(unittest.TestCase):
+                                 stderr=subprocess.PIPE,
+                                 stdout=subprocess.PIPE)
+         out, err = proc.communicate(data)
++        err = strip_python_stderr(err)
+         self.assertEqual(err, ''.encode())
+         self.assertEqual(proc.returncode, 0)
+         return out