[Python-modules-commits] r14417 - in packages/python-networkx/trunk/debian (2 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Mon Sep 13 21:20:50 UTC 2010
Date: Monday, September 13, 2010 @ 21:20:47
Author: morph
Revision: 14417
* debian/patches/changeset_r1745.diff
- dropped, available in upstream release
Modified:
packages/python-networkx/trunk/debian/changelog
Deleted:
packages/python-networkx/trunk/debian/patches/changeset_r1745.diff
Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog 2010-09-13 21:15:45 UTC (rev 14416)
+++ packages/python-networkx/trunk/debian/changelog 2010-09-13 21:20:47 UTC (rev 14417)
@@ -1,8 +1,10 @@
python-networkx (1.3-1) UNRELEASED; urgency=low
* New upstream release
+ * debian/patches/changeset_r1745.diff
+ - dropped, available in upstream release
- -- Sandro Tosi <morph at debian.org> Mon, 13 Sep 2010 23:15:28 +0200
+ -- Sandro Tosi <morph at debian.org> Mon, 13 Sep 2010 23:20:22 +0200
python-networkx (1.1-2) unstable; urgency=low
Deleted: packages/python-networkx/trunk/debian/patches/changeset_r1745.diff
===================================================================
--- packages/python-networkx/trunk/debian/patches/changeset_r1745.diff 2010-09-13 21:15:45 UTC (rev 14416)
+++ packages/python-networkx/trunk/debian/patches/changeset_r1745.diff 2010-09-13 21:20:47 UTC (rev 14417)
@@ -1,101 +0,0 @@
-Index: networkx/examples/graph/words.py
-===================================================================
---- networkx/examples/graph/words.py (revision 1429)
-+++ networkx/examples/graph/words.py (revision 1745)
-@@ -61,11 +61,8 @@
- # open file words_dat.txt.gz (or words_dat.txt)
- try:
-- try:
-- import gzip
-- fh=gzip.open('words_dat.txt.gz','r')
-- except:
-- fh=open("words_dat.txt","r")
-- except IOError:
-- raise "File words_dat.txt not found."
-+ import gzip
-+ fh=gzip.open('words_dat.txt.gz','r')
-+ except:
-+ fh=open("words_dat.txt","r")
-
- G = Graph(name="words")
-Index: networkx/examples/graph/football.py
-===================================================================
---- networkx/examples/graph/football.py (revision 1690)
-+++ networkx/examples/graph/football.py (revision 1745)
-@@ -20,6 +20,6 @@
- try:
- import pyparsing
--except ImportError:
-- raise "pyparsing not found: install http://pyparsing.wikispaces.com/"
-+except ImportError,e:
-+ raise ImportError(str(e)+". Check http://pyparsing.wikispaces.com/")
-
- from networkx import *
-@@ -27,5 +27,5 @@
- url="http://www-personal.umich.edu/~mejn/netdata/football.zip"
-
--import urllib
-+import urllib
- import StringIO
- import zipfile
-@@ -33,5 +33,5 @@
- sock = urllib.urlopen(url) # open URL
- s=StringIO.StringIO(sock.read()) # read into StringIO "file"
--sock.close()
-+sock.close()
-
- zf = zipfile.ZipFile(s) # zipfile object
-Index: networkx/examples/graph/roget.py
-===================================================================
---- networkx/examples/graph/roget.py (revision 1429)
-+++ networkx/examples/graph/roget.py (revision 1745)
-@@ -42,11 +42,8 @@
- # open file roget_dat.txt.gz (or roget_dat.txt)
- try:
-- try:
-- import gzip
-- fh=gzip.open('roget_dat.txt.gz','r')
-- except:
-- fh=open("roget_dat.txt","r")
-- except IOError:
-- raise "File roget_dat.txt not found."
-+ import gzip
-+ fh=gzip.open('roget_dat.txt.gz','r')
-+ except:
-+ fh=open("roget_dat.txt","r")
-
- G=DiGraph()
-Index: networkx/examples/graph/knuth_miles.py
-===================================================================
---- networkx/examples/graph/knuth_miles.py (revision 1429)
-+++ networkx/examples/graph/knuth_miles.py (revision 1745)
-@@ -36,11 +36,8 @@
- # open file miles_dat.txt.gz (or miles_dat.txt)
- try:
-- try:
-- import gzip
-- fh = gzip.open('knuth_miles.txt.gz','r')
-- except:
-- fh=open("knuth_miles.txt","r")
-- except IOError:
-- raise "File knuth_miles.txt not found."
-+ import gzip
-+ fh = gzip.open('knuth_miles.txt.gz','r')
-+ except:
-+ fh=open("knuth_miles.txt","r")
-
- G=nx.Graph()
-Index: networkx/examples/algorithms/blockmodel.py
-===================================================================
---- networkx/examples/algorithms/blockmodel.py (revision 1541)
-+++ networkx/examples/algorithms/blockmodel.py (revision 1745)
-@@ -50,8 +50,5 @@
-
- if __name__ == '__main__':
-- try:
-- G=nx.read_edgelist("hartford_drug.edgelist")
-- except IOError:
-- raise "hartford_drug.edgelist not found"
-+ G=nx.read_edgelist("hartford_drug.edgelist")
-
- # Extract largest connected component into graph H
More information about the Python-modules-commits
mailing list