Hello community,
here is the log from the commit of package python3-socketpool for
openSUSE:Factory checked in at 2015-01-08 23:02:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-socketpool (Old)
and /work/SRC/openSUSE:Factory/.python3-socketpool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-socketpool"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-socketpool/python3-socketpool.changes
2013-06-21 19:09:03.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python3-socketpool.new/python3-socketpool.changes
2015-01-08 23:02:56.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Jan 7 21:47:38 UTC 2015 - [email protected]
+
+- specfile: update copyright year
+
+- update to version 0.5.3:
+ * make sure the example works under all supported python's vms
+ * fix example under python 3
+ * fix priority queue initialization on pypy
+
+- reported patch upstream
+
+-------------------------------------------------------------------
Old:
----
socketpool-0.5.2.tar.gz
New:
----
socketpool-0.5.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-socketpool.spec ++++++
--- /var/tmp/diff_new_pack.klB0eC/_old 2015-01-08 23:02:57.000000000 +0100
+++ /var/tmp/diff_new_pack.klB0eC/_new 2015-01-08 23:02:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python3-socketpool
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: python3-socketpool
-Version: 0.5.2
+Version: 0.5.3
Release: 0
Summary: Python socket pool
License: MIT
++++++ socketpool-0.5.2.tar.gz -> socketpool-0.5.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socketpool-0.5.2/PKG-INFO
new/socketpool-0.5.3/PKG-INFO
--- old/socketpool-0.5.2/PKG-INFO 2012-08-05 06:34:47.000000000 +0200
+++ new/socketpool-0.5.3/PKG-INFO 2013-08-30 17:23:10.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: socketpool
-Version: 0.5.2
+Version: 0.5.3
Summary: Python socket pool
Home-page: http://github.com/benoitc/socketpool
Author: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socketpool-0.5.2/examples/test_gevent.py
new/socketpool-0.5.3/examples/test_gevent.py
--- old/socketpool-0.5.2/examples/test_gevent.py 2012-08-05
05:47:57.000000000 +0200
+++ new/socketpool-0.5.3/examples/test_gevent.py 2013-08-30
17:04:57.000000000 +0200
@@ -33,7 +33,7 @@
def runpool(data):
with pool.connection(**options) as conn:
- print ("conn: pool size: %s" % pool.size())
+ print ("conn: pool size: %s" % pool.size)
sent = conn.send(data)
echo_data = conn.recv(1024)
@@ -45,13 +45,13 @@
gevent.joinall(jobs)
delay = time.time() - start
- print ("final pool size: %s" % pool.size())
+ print ("final pool size: %s" % pool.size)
with pool.connection(**options) as conn:
- print ("conn: pool size: %s" % pool.size())
+ print ("conn: pool size: %s" % pool.size)
sent = conn.send("hello")
echo_data = conn.recv(1024)
assert "hello" == echo_data
- print ("final pool size: %s" % pool.size())
+ print ("final pool size: %s" % pool.size)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socketpool-0.5.2/examples/test_threaded.py
new/socketpool-0.5.3/examples/test_threaded.py
--- old/socketpool-0.5.2/examples/test_threaded.py 2012-08-05
06:32:36.000000000 +0200
+++ new/socketpool-0.5.3/examples/test_threaded.py 2013-08-30
17:04:57.000000000 +0200
@@ -72,7 +72,7 @@
break
try:
with pool.connection() as conn:
- print("conn: pool size: %s" % pool.size())
+ print("conn: pool size: %s" % pool.size)
sent = conn.send(data)
echo = conn.recv(1024)
print("got %s" % data)
@@ -91,7 +91,7 @@
q.join()
- print ("final pool size: %s" % pool.size())
+ print ("final pool size: %s" % pool.size)
pool.release_all()
server.shutdown()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socketpool-0.5.2/setup.py
new/socketpool-0.5.3/setup.py
--- old/socketpool-0.5.2/setup.py 2012-08-05 06:33:47.000000000 +0200
+++ new/socketpool-0.5.3/setup.py 2013-08-30 17:04:57.000000000 +0200
@@ -32,7 +32,7 @@
setup(name='socketpool',
- version='0.5.2',
+ version='0.5.3',
description = 'Python socket pool',
long_description = long_description,
classifiers = CLASSIFIERS,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socketpool-0.5.2/socketpool/pool.py
new/socketpool-0.5.3/socketpool/pool.py
--- old/socketpool-0.5.2/socketpool/pool.py 2012-08-05 06:22:13.000000000
+0200
+++ new/socketpool-0.5.3/socketpool/pool.py 2013-08-30 17:04:57.000000000
+0200
@@ -46,10 +46,15 @@
retry_max=3, retry_delay=.1,
timeout=-1, max_lifetime=600.,
max_size=10, options=None,
- reap_connections=True, backend="thread"):
+ reap_connections=True, reap_delay=1,
+ backend="thread"):
- self.backend_mod = load_backend(backend)
- self.backend = backend
+ if isinstance(backend, str):
+ self.backend_mod = load_backend(backend)
+ self.backend = backend
+ else:
+ self.backend_mod = backend
+ self.backend = str(getattr(backend, '__name__', backend))
self.max_size = max_size
self.pool = getattr(self.backend_mod, 'PriorityQueue')()
self._free_conns = 0
@@ -71,6 +76,7 @@
self._reaper = None
if reap_connections:
+ self.reap_delay = reap_delay
self.start_reaper()
def too_old(self, conn):
@@ -90,13 +96,14 @@
def start_reaper(self):
self._reaper = self.backend_mod.ConnectionReaper(self,
- delay=self.max_lifetime)
+ delay=self.reap_delay)
self._reaper.ensure_started()
def _reap_connection(self, conn):
if conn.is_connected():
conn.invalidate()
+ @property
def size(self):
return self.pool.qsize()
@@ -192,4 +199,3 @@
conn.handle_exception(e)
finally:
self.release_connection(conn)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socketpool-0.5.2/socketpool/util.py
new/socketpool-0.5.3/socketpool/util.py
--- old/socketpool-0.5.2/socketpool/util.py 2012-08-05 05:57:11.000000000
+0200
+++ new/socketpool-0.5.3/socketpool/util.py 2013-08-30 17:04:57.000000000
+0200
@@ -5,6 +5,7 @@
import errno
import os
+import platform
import select
import socket
import sys
@@ -70,6 +71,16 @@
raise ImportError(error_msg)
+def can_use_kqueue():
+ # See Issue #15. kqueue doesn't work on OS X 10.6 and below.
+ if not hasattr(select, "kqueue"):
+ return False
+
+ if platform.system() == 'Darwin' and platform.mac_ver()[0] < '10.7':
+ return False
+
+ return True
+
def is_connected(skt):
try:
fno = skt.fileno()
@@ -99,7 +110,7 @@
p.unregister(fno)
return True
p.unregister(fno)
- elif hasattr(select, "kqueue"):
+ elif can_use_kqueue():
kq = select.kqueue()
events = [
select.kevent(fno, select.KQ_FILTER_READ, select.KQ_EV_ADD),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socketpool-0.5.2/socketpool.egg-info/PKG-INFO
new/socketpool-0.5.3/socketpool.egg-info/PKG-INFO
--- old/socketpool-0.5.2/socketpool.egg-info/PKG-INFO 2012-08-05
06:34:47.000000000 +0200
+++ new/socketpool-0.5.3/socketpool.egg-info/PKG-INFO 2013-08-30
17:23:10.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: socketpool
-Version: 0.5.2
+Version: 0.5.3
Summary: Python socket pool
Home-page: http://github.com/benoitc/socketpool
Author: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socketpool-0.5.2/socketpool.egg-info/SOURCES.txt
new/socketpool-0.5.3/socketpool.egg-info/SOURCES.txt
--- old/socketpool-0.5.2/socketpool.egg-info/SOURCES.txt 2012-08-05
06:34:47.000000000 +0200
+++ new/socketpool-0.5.3/socketpool.egg-info/SOURCES.txt 2013-08-30
17:23:10.000000000 +0200
@@ -19,4 +19,5 @@
socketpool.egg-info/SOURCES.txt
socketpool.egg-info/dependency_links.txt
socketpool.egg-info/top_level.txt
+tests/test_backend_finding.py
tests/test_pool_01.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socketpool-0.5.2/tests/test_backend_finding.py
new/socketpool-0.5.3/tests/test_backend_finding.py
--- old/socketpool-0.5.2/tests/test_backend_finding.py 1970-01-01
01:00:00.000000000 +0100
+++ new/socketpool-0.5.3/tests/test_backend_finding.py 2013-08-30
17:04:57.000000000 +0200
@@ -0,0 +1,31 @@
+import pytest
+from socketpool.pool import ConnectionPool
+from socketpool.conn import TcpConnector
+
+def make_and_check_backend(expected_name, **kw):
+ pool = ConnectionPool(TcpConnector, **kw)
+ assert pool.backend == expected_name
+ return pool
+
+
+def test_default_backend():
+ make_and_check_backend('thread')
+
+
+def test_thread_backend():
+ make_and_check_backend('thread', backend='thread')
+
+
+def test_gevent_backend():
+ pytest.importorskip('gevent')
+ make_and_check_backend('gevent', backend='gevent')
+
+
+def test_eventlet_backend():
+ pytest.importorskip('eventlet')
+ make_and_check_backend('eventlet', backend='eventlet')
+
+
+def test_thread_backend_as_module():
+ from socketpool import backend_thread
+ make_and_check_backend('socketpool.backend_thread', backend=backend_thread)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
