[Python-modules-commits] r31832 - in packages/matplotlib/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Sunday, February 8, 2015 @ 20:47:16
  Author: morph
Revision: 31832

* debian/patches/test_backend_with_timeout.patch
  - removed, merged upstream

Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/series
Deleted:
  packages/matplotlib/trunk/debian/patches/test_backend_with_timeout.patch

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2015-02-08 20:04:09 UTC (rev 31831)
+++ packages/matplotlib/trunk/debian/changelog	2015-02-08 20:47:16 UTC (rev 31832)
@@ -3,8 +3,10 @@
   * New upstream release candidate
   * debian/copyright
     - extend packaging copyright years
+  * debian/patches/test_backend_with_timeout.patch
+    - removed, merged upstream
 
- -- Sandro Tosi <morph at debian.org>  Sun, 08 Feb 2015 19:44:00 +0000
+ -- Sandro Tosi <morph at debian.org>  Sun, 08 Feb 2015 20:47:05 +0000
 
 matplotlib (1.4.2-3) unstable; urgency=medium
 

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2015-02-08 20:04:09 UTC (rev 31831)
+++ packages/matplotlib/trunk/debian/patches/series	2015-02-08 20:47:16 UTC (rev 31832)
@@ -6,4 +6,3 @@
 multiarch-tktcl.patch
 gtk3agg_check_no-multiprocessing.patch
 gtk3cairo_check_no-multiprocessing.patch
-test_backend_with_timeout.patch

Deleted: packages/matplotlib/trunk/debian/patches/test_backend_with_timeout.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/test_backend_with_timeout.patch	2015-02-08 20:04:09 UTC (rev 31831)
+++ packages/matplotlib/trunk/debian/patches/test_backend_with_timeout.patch	2015-02-08 20:47:16 UTC (rev 31832)
@@ -1,74 +0,0 @@
-From 1a182a98f76ce8c624bbaf3882e40d799e867338 Mon Sep 17 00:00:00 2001
-From: Jens Hedegaard Nielsen <jens.nielsen at ucl.ac.uk>
-Date: Wed, 29 Oct 2014 19:32:42 +0000
-Subject: [PATCH] Use map_async and get to avoid a deadlock
-
----
- setupext.py | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/setupext.py
-+++ b/setupext.py
-@@ -13,7 +13,6 @@ import sys
- import warnings
- from textwrap import fill
- 
--
- PY3 = (sys.version_info[0] >= 3)
- 
- 
-@@ -1843,12 +1842,25 @@ class BackendGtk3Cairo(OptionalBackendPa
-             p = multiprocessing.Pool()
-         except:
-             return "unknown (can not use multiprocessing to determine)"
--        success, msg = p.map(backend_gtk3cairo_internal_check, [0])[0]
--        p.close()
--        p.join()
-+        try:
-+            res = p.map_async(backend_gtk3cairo_internal_check, [0])
-+            success, msg = res.get(timeout=10)[0]
-+        except multiprocessing.TimeoutError:
-+            p.terminate()
-+            # No result returned. Probaly hanging, terminate the process.
-+            success = False
-+            raise CheckFailed("Check timed out")
-+        except:
-+            p.close()
-+            success = False
-+            raise
-+        else:
-+            p.close()
-+        finally:
-+            p.join()
-+
-         if success:
-             BackendAgg.force = True
--
-             return msg
-         else:
-             raise CheckFailed(msg)
-@@ -1979,13 +1991,21 @@ class BackendQtBase(OptionalBackendPacka
-         else:
-             # Multiprocessing OK
-             try:
--                msg = p.map(self.callback, [self])[0]
-+                res = p.map_async(self.callback, [self])
-+                msg = res.get(timeout=10)[0]
-+            except multiprocessing.TimeoutError:
-+                p.terminate()
-+                # No result returned. Probaly hanging, terminate the process.
-+                raise CheckFailed("Check timed out")
-             except:
--                # If we hit an error on multiprocessing raise it
-+                # Some other error.
-+                p.close()
-                 raise
-+            else:
-+                # Clean exit
-+                p.close()
-             finally:
-                 # Tidy up multiprocessing
--                p.close()
-                 p.join()
- 
-         return msg