Ubuntu

Merge lp:~logan/ubuntu/quantal/python-gevent/new-upstream into lp:ubuntu/quantal/python-gevent

Proposed by Logan Rosen on 2012-07-23
Status: Merged
Merged at revision: 11
Proposed branch: lp:~logan/ubuntu/quantal/python-gevent/new-upstream
Merge into: lp:ubuntu/quantal/python-gevent
Diff against target: 305 lines (+64/-81) 14 files modified
To merge this branch: bzr merge lp:~logan/ubuntu/quantal/python-gevent/new-upstream
Reviewer Review Type Date Requested Status
Barry Warsaw Approve on 2012-08-14
Ubuntu branches 2012-07-23 Pending
Review via email: mp+116197@code.launchpad.net
To post a comment you must log in.
Barry Warsaw (barry) wrote :

Thanks again for another good contribution to Ubuntu! I will sponsor this branch with one small addition. Because we carry deltas from Debian (using dh_python2 instead of python-support), I have added a comment to the changelog to that effect.

Would you please submit a bug in Debian for the new version (bonus if it includes the change to dh_python2 :), create a bug in Launchpad and link the two? That we we can resync to Debian when the new version is available there.

review: Approve

Preview Diff

1=== removed file '.pc/applied-patches'
2--- .pc/applied-patches 2011-05-17 16:43:20 +0000
3+++ .pc/applied-patches 1970-01-01 00:00:00 +0000
4@@ -1,1 +0,0 @@
5-offline-doc-cross-reference
6
7=== removed directory '.pc/offline-doc-cross-reference'
8=== removed directory '.pc/offline-doc-cross-reference/doc'
9=== removed file '.pc/offline-doc-cross-reference/doc/mysphinxext.py'
10--- .pc/offline-doc-cross-reference/doc/mysphinxext.py 2011-05-17 16:43:20 +0000
11+++ .pc/offline-doc-cross-reference/doc/mysphinxext.py 1970-01-01 00:00:00 +0000
12@@ -1,70 +0,0 @@
13-from sphinx.ext.autodoc import cut_lines
14-from sphinx.ext import intersphinx
15-from docutils import nodes
16-
17-noisy = 0
18-message_cache = set()
19-
20-
21-def missing_reference(app, env, node, contnode):
22- """Search the index for missing references.
23- For example, resolve :class:`Event` to :class:`Event <gevent.event.Event>`"""
24- # XXX methods and functions resolved by this function miss their ()
25-
26- if intersphinx.missing_reference(app, env, node, contnode) is not None:
27- # is there a better way to give intersphinx a bigger priority?
28- return
29-
30- env = app.builder.env
31-
32- type = node['reftype']
33- target = node['reftarget']
34- modname = node.get('py:module')
35- classname = node.get('py:class')
36-
37- if modname and classname:
38- return
39-
40- def new_reference(refuri, reftitle):
41- newnode = nodes.reference('', '')
42- newnode['refuri'] = refuri
43- newnode['reftitle'] = reftitle
44- newnode['py:class'] = 'external-xref'
45- newnode['classname'] = 'external-xref'
46- newnode.append(contnode)
47- msg = 'Resolved missing-reference: :%5s:`%s` -> %s' % (type, target, refuri)
48- if noisy >= 1 or msg not in message_cache:
49- print msg
50- message_cache.add(msg)
51- return newnode
52-
53- if noisy >= 1:
54- print 'Looking for %s' % [type, target, modname, classname]
55- print node
56-
57- for docname, items in env.indexentries.iteritems():
58- if noisy >= 2:
59- print docname
60- for (i_type, i_string, i_target, i_aliasname) in items:
61- if noisy >= 3:
62- print '---', [i_type, i_string, i_target, i_aliasname]
63- if i_aliasname.endswith(target):
64- stripped_aliasname = i_aliasname[len(docname):]
65- if stripped_aliasname:
66- assert stripped_aliasname[0] == '.', repr(stripped_aliasname)
67- stripped_aliasname = stripped_aliasname[1:]
68- if stripped_aliasname == target:
69- if noisy >= 1:
70- print '--- found %s %s in %s' % (type, target, i_aliasname)
71- return new_reference(docname + '.html#' + i_aliasname, i_aliasname)
72-
73- if type == 'mod':
74- modules = [x for x in env.indexentries.keys() if x.startswith('gevent.')]
75- target = 'gevent.' + target
76- if target in modules:
77- return new_reference(target + '.html', target)
78-
79-
80-def setup(app):
81- app.connect('missing-reference', missing_reference)
82- app.connect('autodoc-process-docstring', cut_lines(2, what=['module']))
83
84=== modified file 'PKG-INFO'
85--- PKG-INFO 2011-05-17 16:43:20 +0000
86+++ PKG-INFO 2012-07-23 06:30:25 +0000
87@@ -1,6 +1,6 @@
88 Metadata-Version: 1.0
89 Name: gevent
90-Version: 0.13.6
91+Version: 0.13.7
92 Summary: Python network library that uses greenlet and libevent for easy and scalable concurrency
93 Home-page: http://www.gevent.org/
94 Author: Denis Bilenko
95@@ -9,6 +9,16 @@
96 Description: gevent_
97 =======
98
99+ .. attention::
100+
101+ New_ version of gevent uses libev_ and c-ares rather than libevent and includes all the dependencies in the release tarball.
102+
103+ You can download the 1.0 beta release from `google code`_. Please give it a try.
104+
105+ .. _libev: http://blog.gevent.org/2011/04/28/libev-and-libevent/
106+ .. _google code: http://code.google.com/p/gevent/downloads/
107+ .. _New: https://bitbucket.org/denis/gevent/src/tip/changelog.rst#cl-7
108+
109 gevent_ is a Python networking library that uses greenlet_ to provide synchronous API on top of libevent_ event loop.
110
111 Features include:
112
113=== modified file 'README.rst'
114--- README.rst 2010-07-22 12:09:58 +0000
115+++ README.rst 2012-07-23 06:30:25 +0000
116@@ -1,6 +1,16 @@
117 gevent_
118 =======
119
120+.. attention::
121+
122+ New_ version of gevent uses libev_ and c-ares rather than libevent and includes all the dependencies in the release tarball.
123+
124+ You can download the 1.0 beta release from `google code`_. Please give it a try.
125+
126+.. _libev: http://blog.gevent.org/2011/04/28/libev-and-libevent/
127+.. _google code: http://code.google.com/p/gevent/downloads/
128+.. _New: https://bitbucket.org/denis/gevent/src/tip/changelog.rst#cl-7
129+
130 gevent_ is a Python networking library that uses greenlet_ to provide synchronous API on top of libevent_ event loop.
131
132 Features include:
133
134=== modified file 'changelog.rst'
135--- changelog.rst 2011-05-17 16:43:20 +0000
136+++ changelog.rst 2012-07-23 06:30:25 +0000
137@@ -4,6 +4,15 @@
138 .. currentmodule:: gevent
139
140
141+Release 0.13.7 (April 12, 2012)
142+-------------------------------
143+
144+- Fixed #94: fallback to buffer if memoryview fails in _get_memory on python 2.7.
145+- Fixed #103: ``Queue(None).full()`` returns ``False`` now (previously it returned ``True``).
146+- Fixed #112: threading._sleep is not patched. Thanks to David LaBissoniere.
147+- Fixed #115: _dummy gets unexpected Timeout arg.
148+
149+
150 Release 0.13.6 (May 2, 2011)
151 ----------------------------
152
153
154=== modified file 'debian/changelog'
155--- debian/changelog 2012-01-02 17:00:56 +0000
156+++ debian/changelog 2012-07-23 06:30:25 +0000
157@@ -1,3 +1,10 @@
158+python-gevent (0.13.7-0ubuntu1) quantal; urgency=low
159+
160+ * New upstream release.
161+ * Bump Standards-Version to 3.9.3.
162+
163+ -- Logan Rosen <logatronico@gmail.com> Mon, 23 Jul 2012 02:22:53 -0400
164+
165 python-gevent (0.13.6-1ubuntu1) precise; urgency=low
166
167 * Convert from python-support to dh_python2
168
169=== modified file 'debian/control'
170--- debian/control 2012-01-02 17:00:56 +0000
171+++ debian/control 2012-07-23 06:30:25 +0000
172@@ -5,7 +5,7 @@
173 Uploaders: Andreas Schuldei <andreas@debian.org>
174 Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), libevent-dev (>= 1.4),
175 python-greenlet | python-codespeak-lib (<< 1.0), python-sphinx (>= 0.6)
176-Standards-Version: 3.9.0
177+Standards-Version: 3.9.3
178 Section: python
179 Homepage: http://www.gevent.org/
180
181
182=== modified file 'doc/mysphinxext.py'
183--- doc/mysphinxext.py 2011-05-17 16:43:20 +0000
184+++ doc/mysphinxext.py 2012-07-23 06:30:25 +0000
185@@ -51,6 +51,7 @@
186 if i_aliasname.endswith(target):
187 stripped_aliasname = i_aliasname[len(docname):]
188 if stripped_aliasname:
189+ assert stripped_aliasname[0] == '.', repr(stripped_aliasname)
190 stripped_aliasname = stripped_aliasname[1:]
191 if stripped_aliasname == target:
192 if noisy >= 1:
193
194=== modified file 'gevent.egg-info/PKG-INFO'
195--- gevent.egg-info/PKG-INFO 2011-05-17 16:43:20 +0000
196+++ gevent.egg-info/PKG-INFO 2012-07-23 06:30:25 +0000
197@@ -1,6 +1,6 @@
198 Metadata-Version: 1.0
199 Name: gevent
200-Version: 0.13.6
201+Version: 0.13.7
202 Summary: Python network library that uses greenlet and libevent for easy and scalable concurrency
203 Home-page: http://www.gevent.org/
204 Author: Denis Bilenko
205@@ -9,6 +9,16 @@
206 Description: gevent_
207 =======
208
209+ .. attention::
210+
211+ New_ version of gevent uses libev_ and c-ares rather than libevent and includes all the dependencies in the release tarball.
212+
213+ You can download the 1.0 beta release from `google code`_. Please give it a try.
214+
215+ .. _libev: http://blog.gevent.org/2011/04/28/libev-and-libevent/
216+ .. _google code: http://code.google.com/p/gevent/downloads/
217+ .. _New: https://bitbucket.org/denis/gevent/src/tip/changelog.rst#cl-7
218+
219 gevent_ is a Python networking library that uses greenlet_ to provide synchronous API on top of libevent_ event loop.
220
221 Features include:
222
223=== modified file 'gevent/__init__.py'
224--- gevent/__init__.py 2011-05-17 16:43:20 +0000
225+++ gevent/__init__.py 2012-07-23 06:30:25 +0000
226@@ -6,9 +6,9 @@
227 See http://www.gevent.org/ for the documentation.
228 """
229
230-version_info = (0, 13, 6)
231-__version__ = '0.13.6'
232-__changeset__ = '1734:6c834b912c36'
233+version_info = (0, 13, 7)
234+__version__ = '0.13.7'
235+__changeset__ = '1744:76188d9922e0'
236
237 __all__ = ['Greenlet',
238 'GreenletExit',
239
240=== modified file 'gevent/monkey.py'
241--- gevent/monkey.py 2011-05-17 16:43:20 +0000
242+++ gevent/monkey.py 2012-07-23 06:30:25 +0000
243@@ -106,6 +106,8 @@
244 threading._allocate_lock = green_thread.allocate_lock
245 threading.Lock = green_thread.allocate_lock
246 threading._get_ident = green_thread.get_ident
247+ from gevent.hub import sleep
248+ threading._sleep = sleep
249 if _threading_local:
250 _threading_local = __import__('_threading_local')
251 _threading_local.local = local
252
253=== modified file 'gevent/queue.py'
254--- gevent/queue.py 2011-05-17 16:43:20 +0000
255+++ gevent/queue.py 2012-07-23 06:30:25 +0000
256@@ -102,7 +102,7 @@
257
258 ``Queue(None)`` is never full.
259 """
260- return self.qsize() >= self.maxsize
261+ return self.maxsize is not None and self.qsize() >= self.maxsize
262
263 def put(self, item, block=True, timeout=None):
264 """Put an item into the queue.
265
266=== modified file 'gevent/socket.py'
267--- gevent/socket.py 2011-05-17 16:43:20 +0000
268+++ gevent/socket.py 2012-07-23 06:30:25 +0000
269@@ -255,8 +255,13 @@
270
271 if sys.version_info[:2] < (2, 7):
272 _get_memory = buffer
273+elif sys.version_info[:2] < (3, 0):
274+ def _get_memory(string, offset):
275+ try:
276+ return memoryview(string)[offset:]
277+ except TypeError:
278+ return buffer(string, offset)
279 else:
280-
281 def _get_memory(string, offset):
282 return memoryview(string)[offset:]
283
284@@ -264,7 +269,7 @@
285 class _closedsocket(object):
286 __slots__ = []
287
288- def _dummy(*args):
289+ def _dummy(*args, **kwargs):
290 raise error(EBADF, 'Bad file descriptor')
291 # All _delegate_methods must also be initialized here.
292 send = recv = recv_into = sendto = recvfrom = recvfrom_into = _dummy
293
294=== modified file 'greentest/testrunner.py'
295--- greentest/testrunner.py 2011-05-17 16:43:20 +0000
296+++ greentest/testrunner.py 2012-07-23 06:30:25 +0000
297@@ -34,7 +34,7 @@
298 # - screws up warnings location, causing them to appear as originated from testrunner.py
299
300 # the number of seconds each test script is allowed to run
301-DEFAULT_TIMEOUT = 60
302+DEFAULT_TIMEOUT = 120
303
304 # the number of bytes of output that is recorded; the rest is thrown away
305 OUTPUT_LIMIT = 50000

Subscribers

People subscribed via source and target branches

to all changes: