← Back to branch summary

~ubuntu-branches/ubuntu/trusty/pyzmq/trusty

« back to all changes in this revision

Viewing changes to debian/patches/fix-py3-green.patch

  • Committer: Package Import Robot
  • Author(s): Julian Taylor
  • Date: 2013-02-24 19:23:15 UTC
  • mfrom: (2.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20130224192315-9xkzrza97h674d07
Tags: 2.2.0.1-1
* New upstream release
* relicense debian packaging to LGPL-3
* update watch file to use github directly
  thanks to Bart Martens for the file
* add autopkgtests
* drop obsolete DM-Upload-Allowed
* bump standard to 3.9.4, no changes required

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-py3-green.patch
 
1
Description: make green py3 compatible
 
2
Applied-Upstream: 13.0.0
 
3
--- a/zmq/green/core.py.orig      2013-02-24 20:06:01.012299572 +0100
 
4
+++ b/zmq/green/core.py   2013-02-24 20:15:15.420298258 +0100
 
5
@@ -114,7 +114,7 @@
 
6
         try:
 
7
             timeout.start()
 
8
             self.__writable.get(block=True)
 
9
-        except gevent.Timeout, t:
 
10
+        except gevent.Timeout as t:
 
11
             if t is not timeout:
 
12
                 raise
 
13
             toc = time.time()
 
14
@@ -138,7 +138,7 @@
 
15
         try:
 
16
             timeout.start()
 
17
             self.__readable.get(block=True)
 
18
-        except gevent.Timeout, t:
 
19
+        except gevent.Timeout as t:
 
20
             if t is not timeout:
 
21
                 raise
 
22
             toc = time.time()
 
23