[Python-modules-commits] r34409 - in packages/python-networkx/trunk/debian (3 files)

[zigo at users.alioth.debian.org]

    Date: Tuesday, September 29, 2015 @ 10:59:58
  Author: zigo
Revision: 34409

Removed now useless python-3.4.patch patch from Chuck Short.

Modified:
  packages/python-networkx/trunk/debian/changelog
  packages/python-networkx/trunk/debian/patches/series
Deleted:
  packages/python-networkx/trunk/debian/patches/python-3.4.patch

Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog	2015-09-29 10:59:00 UTC (rev 34408)
+++ packages/python-networkx/trunk/debian/changelog	2015-09-29 10:59:58 UTC (rev 34409)
@@ -7,6 +7,7 @@
   * Move to Build-Depends: what was in Build-Depends-Indep: but which is needed
     for the clean target.
   * Dropped version of packages for those already provided in Jessie.
+  * Removed now useless python-3.4.patch patch from Chuck Short.
 
  -- Thomas Goirand <zigo at debian.org>  Wed, 02 Sep 2015 13:17:15 +0000
 

Deleted: packages/python-networkx/trunk/debian/patches/python-3.4.patch
===================================================================
--- packages/python-networkx/trunk/debian/patches/python-3.4.patch	2015-09-29 10:59:00 UTC (rev 34408)
+++ packages/python-networkx/trunk/debian/patches/python-3.4.patch	2015-09-29 10:59:58 UTC (rev 34409)
@@ -1,24 +0,0 @@
-Description: Backport python3 fixes.
-Author: Chuck Short <zulcss at ubuntu.com>
-Forwarded: Not needed
-diff -Naurp networkx-1.8.1.orig/networkx/readwrite/nx_shp.py networkx-1.8.1/networkx/readwrite/nx_shp.py
---- networkx-1.8.1.orig/networkx/readwrite/nx_shp.py	2013-08-04 09:53:31.000000000 -0400
-+++ networkx-1.8.1/networkx/readwrite/nx_shp.py	2014-01-27 10:57:47.015239061 -0500
-@@ -154,7 +154,7 @@ def write_shp(G, outdir):
-         feature.SetGeometry(g)
-         if attributes != None:
-             # Loop through attributes, assigning data to each field
--            for field, data in attributes.iteritems():
-+            for field, data in attributes.iter():
-                 feature.SetField(field, data)
-         lyr.CreateFeature(feature)
-         feature.Destroy()
-@@ -189,7 +189,7 @@ def write_shp(G, outdir):
-         data = G.get_edge_data(*e)
-         g = netgeometry(e, data)
-         # Loop through attribute data in edges
--        for key, data in e[2].iteritems():
-+        for key, data in e[2].iter():
-             # Reject spatial data not required for attribute table
-             if (key != 'Json' and key != 'Wkt' and key != 'Wkb'
-                 and key != 'ShpName'):

Modified: packages/python-networkx/trunk/debian/patches/series
===================================================================
--- packages/python-networkx/trunk/debian/patches/series	2015-09-29 10:59:00 UTC (rev 34408)
+++ packages/python-networkx/trunk/debian/patches/series	2015-09-29 10:59:58 UTC (rev 34409)
@@ -1,6 +1,5 @@
 10_doc_relocation
 20_example_dirs_remove
 30_use_local_objects.inv
-python-3.4.patch
 do-not-use-sphinx_rtd_theme.patch
 using-local-mathjax.js.patch