← Back to branch summary

~ubuntu-branches/ubuntu/utopic/serpentine/utopic

« back to all changes in this revision

Viewing changes to debian/patches/python2.4-compat.patch

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2008-03-23 18:08:56 UTC
  • Revision ID: james.westby@ubuntu.com-20080323180856-3kj9x2zktc1s81fb
Tags: 0.9-5ubuntu1
https://launchpad.net/bugs/199014
* Merge from debian unstable, remaining changes (LP: #199014):
  - Use a recommends on gstreamer0.10-plugins-ugly, not a depends
  - Reformat Build-Dep and Build-Dep-Indep so source package builds
  - Modify Maintainer value to match the DebianMaintainerField
    specification.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/python2.4-compat.patch
 
1
diff -Nur serpentine-0.9/serpentine/plugins/plugfilter_k3b.py serpentine-0.9.new/serpentine/plugins/plugfilter_k3b.py
 
2
--- serpentine-0.9/serpentine/plugins/plugfilter_k3b.py 2008-03-14 22:42:19.000000000 +0000
 
3
+++ serpentine-0.9.new/serpentine/plugins/plugfilter_k3b.py     2008-03-14 22:43:08.000000000 +0000
 
4
@@ -68,12 +68,13 @@
 
5
             
 
6
 
 
7
         try:
 
8
-            zfile = zipfile.ZipFile(fd)
 
9
-            buff = zfile.read("maindata.xml")
 
10
-            root = parseString(buff)
 
11
+            try:
 
12
+                zfile = zipfile.ZipFile(fd)
 
13
+                buff = zfile.read("maindata.xml")
 
14
+                root = parseString(buff)
 
15
             
 
16
-        except (zipfile.BadZipfile, IOError, KeyError, ExpatError):
 
17
-            raise UnsupportedLocationError()
 
18
+            except (zipfile.BadZipfile, IOError, KeyError, ExpatError):
 
19
+                raise UnsupportedLocationError()
 
20
         finally:
 
21
             fd.close()
 
22