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

[zigo at users.alioth.debian.org]

    Date: Wednesday, June 25, 2014 @ 17:22:49
  Author: zigo
Revision: 29495

Added python-3.4.patch (comes from the Ubuntu package).

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

Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog	2014-06-25 17:22:46 UTC (rev 29494)
+++ packages/python-networkx/trunk/debian/changelog	2014-06-25 17:22:49 UTC (rev 29495)
@@ -12,6 +12,7 @@
     60_fix_tests_failure_due_to_py3.3_hash_randomization.patch applied
     upstream.
   * debian/control: removed python-support and added dh-python as build-dep.
+  * Added python-3.4.patch (comes from the Ubuntu package).
 
  -- Thomas Goirand <zigo at debian.org>  Sun, 22 Jun 2014 07:11:42 +0000
 

Added: packages/python-networkx/trunk/debian/patches/python-3.4.patch
===================================================================
--- packages/python-networkx/trunk/debian/patches/python-3.4.patch	                        (rev 0)
+++ packages/python-networkx/trunk/debian/patches/python-3.4.patch	2014-06-25 17:22:49 UTC (rev 29495)
@@ -0,0 +1,24 @@
+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	2014-06-25 17:22:46 UTC (rev 29494)
+++ packages/python-networkx/trunk/debian/patches/series	2014-06-25 17:22:49 UTC (rev 29495)
@@ -2,3 +2,4 @@
 20_example_dirs_remove
 30_use_local_objects.inv
 40_no_setuptools_in_requires.txt
+python-3.4.patch