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

[Logan Rosen]

[Barry Warsaw (barry)]

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

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-05-17 16:43:20 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-offline-doc-cross-reference

=== removed directory '.pc/offline-doc-cross-reference'
=== removed directory '.pc/offline-doc-cross-reference/doc'
=== removed file '.pc/offline-doc-cross-reference/doc/mysphinxext.py'
--- .pc/offline-doc-cross-reference/doc/mysphinxext.py	2011-05-17 16:43:20 +0000
+++ .pc/offline-doc-cross-reference/doc/mysphinxext.py	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-from sphinx.ext.autodoc import cut_lines
-from sphinx.ext import intersphinx
-from docutils import nodes
-
-noisy = 0
-message_cache = set()
-
-
-def missing_reference(app, env, node, contnode):
-    """Search the index for missing references.
-    For example, resolve :class:`Event` to :class:`Event <gevent.event.Event>`"""
-    # XXX methods and functions resolved by this function miss their ()
-
-    if intersphinx.missing_reference(app, env, node, contnode) is not None:
-        # is there a better way to give intersphinx a bigger priority?
-        return
-
-    env = app.builder.env
-
-    type = node['reftype']
-    target = node['reftarget']
-    modname = node.get('py:module')
-    classname = node.get('py:class')
-
-    if modname and classname:
-        return
-
-    def new_reference(refuri, reftitle):
-        newnode = nodes.reference('', '')
-        newnode['refuri'] = refuri
-        newnode['reftitle'] = reftitle
-        newnode['py:class'] = 'external-xref'
-        newnode['classname'] = 'external-xref'
-        newnode.append(contnode)
-        msg = 'Resolved missing-reference: :%5s:`%s` -> %s' % (type, target, refuri)
-        if noisy >= 1 or msg not in message_cache:
-            print msg
-            message_cache.add(msg)
-        return newnode
-
-    if noisy >= 1:
-        print 'Looking for %s' % [type, target, modname, classname]
-        print node
-
-    for docname, items in env.indexentries.iteritems():
-        if noisy >= 2:
-            print docname
-        for (i_type, i_string, i_target, i_aliasname) in items:
-            if noisy >= 3:
-                print '---', [i_type, i_string, i_target, i_aliasname]
-            if i_aliasname.endswith(target):
-                stripped_aliasname = i_aliasname[len(docname):]
-                if stripped_aliasname:
-                    assert stripped_aliasname[0] == '.', repr(stripped_aliasname)
-                    stripped_aliasname = stripped_aliasname[1:]
-                    if stripped_aliasname == target:
-                        if noisy >= 1:
-                            print '--- found %s %s in %s' % (type, target, i_aliasname)
-                        return new_reference(docname + '.html#' + i_aliasname, i_aliasname)
-
-    if type == 'mod':
-        modules = [x for x in env.indexentries.keys() if x.startswith('gevent.')]
-        target = 'gevent.' + target
-        if target in modules:
-            return new_reference(target + '.html', target)
-
-
-def setup(app):
-    app.connect('missing-reference', missing_reference)
-    app.connect('autodoc-process-docstring', cut_lines(2, what=['module']))

=== modified file 'PKG-INFO'
--- PKG-INFO	2011-05-17 16:43:20 +0000
+++ PKG-INFO	2012-07-23 06:30:25 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: gevent
-Version: 0.13.6
+Version: 0.13.7
 Summary: Python network library that uses greenlet and libevent for easy and scalable concurrency
 Home-page: http://www.gevent.org/
 Author: Denis Bilenko
@@ -9,6 +9,16 @@
 Description: gevent_
         =======
         
+        .. attention::
+        
+          New_ version of gevent uses libev_ and c-ares rather than libevent and includes all the dependencies in the release tarball.
+        
+          You can download the 1.0 beta release from `google code`_. Please give it a try.
+        
+        .. _libev: http://blog.gevent.org/2011/04/28/libev-and-libevent/
+        .. _google code: http://code.google.com/p/gevent/downloads/
+        .. _New: https://bitbucket.org/denis/gevent/src/tip/changelog.rst#cl-7
+        
         gevent_ is a Python networking library that uses greenlet_ to provide synchronous API on top of libevent_ event loop.
         
         Features include:

=== modified file 'README.rst'
--- README.rst	2010-07-22 12:09:58 +0000
+++ README.rst	2012-07-23 06:30:25 +0000
@@ -1,6 +1,16 @@
 gevent_
 =======
 
+.. attention::
+
+  New_ version of gevent uses libev_ and c-ares rather than libevent and includes all the dependencies in the release tarball.
+
+  You can download the 1.0 beta release from `google code`_. Please give it a try.
+
+.. _libev: http://blog.gevent.org/2011/04/28/libev-and-libevent/
+.. _google code: http://code.google.com/p/gevent/downloads/
+.. _New: https://bitbucket.org/denis/gevent/src/tip/changelog.rst#cl-7
+
 gevent_ is a Python networking library that uses greenlet_ to provide synchronous API on top of libevent_ event loop.
 
 Features include:

=== modified file 'changelog.rst'
--- changelog.rst	2011-05-17 16:43:20 +0000
+++ changelog.rst	2012-07-23 06:30:25 +0000
@@ -4,6 +4,15 @@
 .. currentmodule:: gevent
 
 
+Release 0.13.7 (April 12, 2012)
+-------------------------------
+
+- Fixed #94: fallback to buffer if memoryview fails in _get_memory on python 2.7.
+- Fixed #103: ``Queue(None).full()`` returns ``False`` now (previously it returned ``True``).
+- Fixed #112: threading._sleep is not patched. Thanks to David LaBissoniere.
+- Fixed #115: _dummy gets unexpected Timeout arg.
+
+
 Release 0.13.6 (May 2, 2011)
 ----------------------------
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-02 17:00:56 +0000
+++ debian/changelog	2012-07-23 06:30:25 +0000
@@ -1,3 +1,10 @@
+python-gevent (0.13.7-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.3.
+
+ -- Logan Rosen <[e-mail]>  Mon, 23 Jul 2012 02:22:53 -0400
+
 python-gevent (0.13.6-1ubuntu1) precise; urgency=low
 
   * Convert from python-support to dh_python2

=== modified file 'debian/control'
--- debian/control	2012-01-02 17:00:56 +0000
+++ debian/control	2012-07-23 06:30:25 +0000
@@ -5,7 +5,7 @@
 Uploaders: Andreas Schuldei <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), libevent-dev (>= 1.4),
                python-greenlet | python-codespeak-lib (<< 1.0), python-sphinx (>= 0.6)
-Standards-Version: 3.9.0
+Standards-Version: 3.9.3
 Section: python
 Homepage: http://www.gevent.org/
 

=== modified file 'doc/mysphinxext.py'
--- doc/mysphinxext.py	2011-05-17 16:43:20 +0000
+++ doc/mysphinxext.py	2012-07-23 06:30:25 +0000
@@ -51,6 +51,7 @@
             if i_aliasname.endswith(target):
                 stripped_aliasname = i_aliasname[len(docname):]
                 if stripped_aliasname:
+                    assert stripped_aliasname[0] == '.', repr(stripped_aliasname)
                     stripped_aliasname = stripped_aliasname[1:]
                     if stripped_aliasname == target:
                         if noisy >= 1:

=== modified file 'gevent.egg-info/PKG-INFO'
--- gevent.egg-info/PKG-INFO	2011-05-17 16:43:20 +0000
+++ gevent.egg-info/PKG-INFO	2012-07-23 06:30:25 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: gevent
-Version: 0.13.6
+Version: 0.13.7
 Summary: Python network library that uses greenlet and libevent for easy and scalable concurrency
 Home-page: http://www.gevent.org/
 Author: Denis Bilenko
@@ -9,6 +9,16 @@
 Description: gevent_
         =======
         
+        .. attention::
+        
+          New_ version of gevent uses libev_ and c-ares rather than libevent and includes all the dependencies in the release tarball.
+        
+          You can download the 1.0 beta release from `google code`_. Please give it a try.
+        
+        .. _libev: http://blog.gevent.org/2011/04/28/libev-and-libevent/
+        .. _google code: http://code.google.com/p/gevent/downloads/
+        .. _New: https://bitbucket.org/denis/gevent/src/tip/changelog.rst#cl-7
+        
         gevent_ is a Python networking library that uses greenlet_ to provide synchronous API on top of libevent_ event loop.
         
         Features include:

=== modified file 'gevent/__init__.py'
--- gevent/__init__.py	2011-05-17 16:43:20 +0000
+++ gevent/__init__.py	2012-07-23 06:30:25 +0000
@@ -6,9 +6,9 @@
 See http://www.gevent.org/ for the documentation.
 """
 
-version_info = (0, 13, 6)
-__version__ = '0.13.6'
-__changeset__ = '1734:6c834b912c36'
+version_info = (0, 13, 7)
+__version__ = '0.13.7'
+__changeset__ = '1744:76188d9922e0'
 
 __all__ = ['Greenlet',
            'GreenletExit',

=== modified file 'gevent/monkey.py'
--- gevent/monkey.py	2011-05-17 16:43:20 +0000
+++ gevent/monkey.py	2012-07-23 06:30:25 +0000
@@ -106,6 +106,8 @@
             threading._allocate_lock = green_thread.allocate_lock
             threading.Lock = green_thread.allocate_lock
             threading._get_ident = green_thread.get_ident
+            from gevent.hub import sleep
+            threading._sleep = sleep
         if _threading_local:
             _threading_local = __import__('_threading_local')
             _threading_local.local = local

=== modified file 'gevent/queue.py'
--- gevent/queue.py	2011-05-17 16:43:20 +0000
+++ gevent/queue.py	2012-07-23 06:30:25 +0000
@@ -102,7 +102,7 @@
 
         ``Queue(None)`` is never full.
         """
-        return self.qsize() >= self.maxsize
+        return self.maxsize is not None and self.qsize() >= self.maxsize
 
     def put(self, item, block=True, timeout=None):
         """Put an item into the queue.

=== modified file 'gevent/socket.py'
--- gevent/socket.py	2011-05-17 16:43:20 +0000
+++ gevent/socket.py	2012-07-23 06:30:25 +0000
@@ -255,8 +255,13 @@
 
 if sys.version_info[:2] < (2, 7):
     _get_memory = buffer
+elif sys.version_info[:2] < (3, 0):
+    def _get_memory(string, offset):
+        try:
+            return memoryview(string)[offset:]
+        except TypeError:
+            return buffer(string, offset)
 else:
-
     def _get_memory(string, offset):
         return memoryview(string)[offset:]
 
@@ -264,7 +269,7 @@
 class _closedsocket(object):
     __slots__ = []
 
-    def _dummy(*args):
+    def _dummy(*args, **kwargs):
         raise error(EBADF, 'Bad file descriptor')
     # All _delegate_methods must also be initialized here.
     send = recv = recv_into = sendto = recvfrom = recvfrom_into = _dummy

=== modified file 'greentest/testrunner.py'
--- greentest/testrunner.py	2011-05-17 16:43:20 +0000
+++ greentest/testrunner.py	2012-07-23 06:30:25 +0000
@@ -34,7 +34,7 @@
 # - screws up warnings location, causing them to appear as originated from testrunner.py
 
 # the number of seconds each test script is allowed to run
-DEFAULT_TIMEOUT = 60
+DEFAULT_TIMEOUT = 120
 
 # the number of bytes of output that is recorded; the rest is thrown away
 OUTPUT_LIMIT = 50000