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

[morph at users.alioth.debian.org]

    Date: Wednesday, July 3, 2013 @ 21:58:56
  Author: morph
Revision: 25072

* debian/patches/60_override_loader_during_tests.patch
  - override __loader__ function during tests

Added:
  packages/matplotlib/trunk/debian/patches/60_override_loader_during_tests.patch
Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/series

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2013-07-03 21:50:30 UTC (rev 25071)
+++ packages/matplotlib/trunk/debian/changelog	2013-07-03 21:58:56 UTC (rev 25072)
@@ -14,12 +14,14 @@
     - changed location of user-specific config file
   * debian/patches/*
     - refreshed and removed merged patch
+  * debian/patches/60_override_loader_during_tests.patch
+    - override __loader__ function during tests
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
   * Fix typos in README.debian.
 
- -- Sandro Tosi <morph at debian.org>  Sun, 30 Jun 2013 18:53:10 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 03 Jul 2013 23:58:40 +0200
 
 matplotlib (1.2.0-1) experimental; urgency=low
 

Added: packages/matplotlib/trunk/debian/patches/60_override_loader_during_tests.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/60_override_loader_during_tests.patch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/60_override_loader_during_tests.patch	2013-07-03 21:58:56 UTC (rev 25072)
@@ -0,0 +1,18 @@
+Description: On Python 3.3, the __loader__ variable may get set when modules are loaded, so this is ok to override
+Author: Michael Droettboom
+Origin: upstream, https://github.com/matplotlib/matplotlib/pull/2170
+Forwarded: not-needed
+Applied-Upstream: https://github.com/matplotlib/matplotlib/commit/263f853d613550476fce560a630d272daec930e5
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/lib/matplotlib/tests/test_basic.py
++++ b/lib/matplotlib/tests/test_basic.py
+@@ -16,6 +16,7 @@ def test_override_builtins():
+         '__name__',
+         '__doc__',
+         '__package__',
++        '__loader__',
+         'any',
+         'all',
+         'sum'

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2013-07-03 21:50:30 UTC (rev 25071)
+++ packages/matplotlib/trunk/debian/patches/series	2013-07-03 21:58:56 UTC (rev 25072)
@@ -2,3 +2,4 @@
 20_matplotlibrc_path_search_fix.patch
 40_bts608939_draw_markers_description.patch
 50_bts608942_spaces_in_param_args.patch
+60_override_loader_during_tests.patch