[Python-modules-commits] r27952 - in packages/python-mock/trunk/debian (4 files)

[barry at users.alioth.debian.org]

    Date: Wednesday, February 26, 2014 @ 20:41:10
  Author: barry
Revision: 27952

* Team upload.
* d/patches/python3.4_compat.patch: Fix FTBFS with Python 3.4.
  (Closes: #739890) (LP: #1283742)
* d/control: Bump Standards-Version with no other changes necessary.

Added:
  packages/python-mock/trunk/debian/patches/python3.4_compat.patch
Modified:
  packages/python-mock/trunk/debian/changelog
  packages/python-mock/trunk/debian/control
  packages/python-mock/trunk/debian/patches/series

Modified: packages/python-mock/trunk/debian/changelog
===================================================================
--- packages/python-mock/trunk/debian/changelog	2014-02-26 20:05:09 UTC (rev 27951)
+++ packages/python-mock/trunk/debian/changelog	2014-02-26 20:41:10 UTC (rev 27952)
@@ -1,3 +1,12 @@
+python-mock (1.0.1-3) unstable; urgency=medium
+
+  * Team upload.
+  * d/patches/python3.4_compat.patch: Fix FTBFS with Python 3.4.
+    (Closes: #739890) (LP: #1283742)
+  * d/control: Bump Standards-Version with no other changes necessary.
+
+ -- Barry Warsaw <barry at debian.org>  Wed, 26 Feb 2014 15:39:36 -0500
+
 python-mock (1.0.1-2) unstable; urgency=low
 
   [ Michael Fladischer ]

Modified: packages/python-mock/trunk/debian/control
===================================================================
--- packages/python-mock/trunk/debian/control	2014-02-26 20:05:09 UTC (rev 27951)
+++ packages/python-mock/trunk/debian/control	2014-02-26 20:41:10 UTC (rev 27952)
@@ -11,7 +11,7 @@
                python3-all (>= 3.1.2-12~),
                python3-setuptools
 Build-Depends-Indep: libjs-jquery, python-sphinx (>= 1.0.7+dfsg-1~)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.4
 X-Python3-Version: >= 3.0
 Homepage: http://www.voidspace.org.uk/python/mock/

Added: packages/python-mock/trunk/debian/patches/python3.4_compat.patch
===================================================================
--- packages/python-mock/trunk/debian/patches/python3.4_compat.patch	                        (rev 0)
+++ packages/python-mock/trunk/debian/patches/python3.4_compat.patch	2014-02-26 20:41:10 UTC (rev 27952)
@@ -0,0 +1,35 @@
+Description: With Python 3.4, some builtins are now introspectable but
+  don't have the full compliment of attributes.  Ignore
+  AttributeErrors when accessing such attributes.
+Author: Barry Warsaw <barry at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739890
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-mock/+bug/1283742
+Forwarded: no
+
+--- a/mock.py
++++ b/mock.py
+@@ -218,12 +218,21 @@
+     funcopy.__name__ = func.__name__
+     funcopy.__doc__ = func.__doc__
+     #funcopy.__dict__.update(func.__dict__)
+-    funcopy.__module__ = func.__module__
++    try:
++        funcopy.__module__ = func.__module__
++    except AttributeError:
++        pass
+     if not inPy3k:
+         funcopy.func_defaults = func.func_defaults
+         return
+-    funcopy.__defaults__ = func.__defaults__
+-    funcopy.__kwdefaults__ = func.__kwdefaults__
++    try:
++        funcopy.__defaults__ = func.__defaults__
++    except AttributeError:
++        pass
++    try:
++        funcopy.__kwdefaults__ = func.__kwdefaults__
++    except AttributeError:
++        pass
+ 
+ 
+ def _callable(obj):

Modified: packages/python-mock/trunk/debian/patches/series
===================================================================
--- packages/python-mock/trunk/debian/patches/series	2014-02-26 20:05:09 UTC (rev 27951)
+++ packages/python-mock/trunk/debian/patches/series	2014-02-26 20:41:10 UTC (rev 27952)
@@ -1 +1,2 @@
 python3.2_tests.patch
+python3.4_compat.patch