Hello community, here is the log from the commit of package python-txsocksx for openSUSE:Factory checked in at 2015-08-05 06:52:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-txsocksx (Old) and /work/SRC/openSUSE:Factory/.python-txsocksx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-txsocksx" Changes: -------- --- /work/SRC/openSUSE:Factory/python-txsocksx/python-txsocksx.changes 2015-07-21 13:28:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-txsocksx.new/python-txsocksx.changes 2015-08-05 06:52:03.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 3 21:27:23 UTC 2015 - nemy...@opensuse.org + +- Update to 1.15.0.2, no changelog entry + +------------------------------------------------------------------- Old: ---- txsocksx-1.13.0.3.tar.gz New: ---- txsocksx-1.15.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-txsocksx.spec ++++++ --- /var/tmp/diff_new_pack.7sHSOt/_old 2015-08-05 06:52:03.000000000 +0200 +++ /var/tmp/diff_new_pack.7sHSOt/_new 2015-08-05 06:52:03.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-txsocksx # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,23 +13,24 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# %define oname txsocksx Name: python-txsocksx -Version: 1.13.0.3 +Version: 1.15.0.2 Release: 0 -License: ISC Summary: Twisted client endpoints for SOCKS{4,4a,5} -Url: https://github.com/habnabit/txsocksx +License: ISC Group: Productivity/Networking/Security +Url: https://github.com/habnabit/txsocksx Source0: https://pypi.python.org/packages/source/t/%{oname}/%{oname}-%{version}.tar.gz +BuildRequires: python-Parsley +BuildRequires: python-Twisted BuildRequires: python-devel BuildRequires: python-setuptools BuildRequires: python-vcversioner -BuildRequires: python-Parsley -BuildRequires: python-Twisted BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} ++++++ txsocksx-1.13.0.3.tar.gz -> txsocksx-1.15.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/txsocksx-1.13.0.3/COPYING new/txsocksx-1.15.0.2/COPYING --- old/txsocksx-1.13.0.3/COPYING 2013-08-21 01:34:32.000000000 +0200 +++ new/txsocksx-1.15.0.2/COPYING 2015-06-12 22:36:32.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 2010-2013, Aaron Gallagher <_...@habnab.it> +Copyright (c) 2010-2015, Aaron Gallagher <_...@habnab.it> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/txsocksx-1.13.0.3/PKG-INFO new/txsocksx-1.15.0.2/PKG-INFO --- old/txsocksx-1.13.0.3/PKG-INFO 2014-05-06 18:20:59.000000000 +0200 +++ new/txsocksx-1.15.0.2/PKG-INFO 2015-08-03 19:18:19.000000000 +0200 @@ -1,15 +1,15 @@ Metadata-Version: 1.1 Name: txsocksx -Version: 1.13.0.3 +Version: 1.15.0.2 Summary: Twisted client endpoints for SOCKS{4,4a,5} Home-page: https://github.com/habnabit/txsocksx Author: Aaron Gallagher Author-email: _...@habnab.it License: ISC -Description: .. image:: https://travis-ci.org/habnabit/txsocksx.png +Description: .. image:: https://img.shields.io/travis/habnabit/txsocksx/master.svg?style=flat-square :target: https://travis-ci.org/habnabit/txsocksx - .. image:: https://coveralls.io/repos/habnabit/txsocksx/badge.png?branch=master + .. image:: https://img.shields.io/coveralls/habnabit/txsocksx/master.svg?style=flat-square :target: https://coveralls.io/r/habnabit/txsocksx?branch=master @@ -109,12 +109,9 @@ Making HTTP requests -------------------- - Twisted's builtin `Agent`_ HTTP client does not support being handed an - arbitrary endpoint. (Yet. `Ticket #6634`_ was filed to make this an API - directly supported by Twisted.) |txsocksx| provides an ``Agent`` as a - workaround, but it uses a private API. There are no guarantees that this - approach will run in newer versions of Twisted, but |txsocksx.http| will - attempt to provide a consistent API. + Twisted's builtin `Agent`_ HTTP client did not support being handed an + arbitrary endpoint before 15.0, so |txsocksx| provides an ``Agent`` for maximum + compatibility. While |txsocksx| requires only Twisted 10.1, |txsocksx.http| requires Twisted 12.1 or greater. Its usage is almost identical to normal ``Agent`` usage:: @@ -135,6 +132,9 @@ |SOCKS5Agent| transparently supports HTTPS via |TLSWrapClientEndpoint|. + For users with Twisted 15.0 or greater, |SOCKS5Agent| also implements + `IAgentEndpointFactory`_. + Upgrading to TLS ---------------- @@ -170,7 +170,7 @@ .. _Twisted endpoints: http://twistedmatrix.com/documents/current/core/howto/endpoints.html .. _IDelayedCall: http://twistedmatrix.com/documents/current/api/twisted.internet.interfaces.IDelayedCall.html .. _Agent: http://twistedmatrix.com/documents/current/web/howto/client.html - .. _Ticket #6634: https://twistedmatrix.com/trac/ticket/6634 + .. _IAgentEndpointFactory: http://twistedmatrix.com/documents/current/api/twisted.web.iweb.IAgentEndpointFactory.html .. |SOCKS5ClientEndpoint| replace:: ``SOCKS5ClientEndpoint`` .. |SOCKS5Agent| replace:: ``SOCKS5Agent`` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/txsocksx-1.13.0.3/README.rst new/txsocksx-1.15.0.2/README.rst --- old/txsocksx-1.13.0.3/README.rst 2013-10-05 19:57:51.000000000 +0200 +++ new/txsocksx-1.15.0.2/README.rst 2015-06-12 22:36:32.000000000 +0200 @@ -1,7 +1,7 @@ -.. image:: https://travis-ci.org/habnabit/txsocksx.png +.. image:: https://img.shields.io/travis/habnabit/txsocksx/master.svg?style=flat-square :target: https://travis-ci.org/habnabit/txsocksx -.. image:: https://coveralls.io/repos/habnabit/txsocksx/badge.png?branch=master +.. image:: https://img.shields.io/coveralls/habnabit/txsocksx/master.svg?style=flat-square :target: https://coveralls.io/r/habnabit/txsocksx?branch=master @@ -101,12 +101,9 @@ Making HTTP requests -------------------- -Twisted's builtin `Agent`_ HTTP client does not support being handed an -arbitrary endpoint. (Yet. `Ticket #6634`_ was filed to make this an API -directly supported by Twisted.) |txsocksx| provides an ``Agent`` as a -workaround, but it uses a private API. There are no guarantees that this -approach will run in newer versions of Twisted, but |txsocksx.http| will -attempt to provide a consistent API. +Twisted's builtin `Agent`_ HTTP client did not support being handed an +arbitrary endpoint before 15.0, so |txsocksx| provides an ``Agent`` for maximum +compatibility. While |txsocksx| requires only Twisted 10.1, |txsocksx.http| requires Twisted 12.1 or greater. Its usage is almost identical to normal ``Agent`` usage:: @@ -127,6 +124,9 @@ |SOCKS5Agent| transparently supports HTTPS via |TLSWrapClientEndpoint|. +For users with Twisted 15.0 or greater, |SOCKS5Agent| also implements +`IAgentEndpointFactory`_. + Upgrading to TLS ---------------- @@ -162,7 +162,7 @@ .. _Twisted endpoints: http://twistedmatrix.com/documents/current/core/howto/endpoints.html .. _IDelayedCall: http://twistedmatrix.com/documents/current/api/twisted.internet.interfaces.IDelayedCall.html .. _Agent: http://twistedmatrix.com/documents/current/web/howto/client.html -.. _Ticket #6634: https://twistedmatrix.com/trac/ticket/6634 +.. _IAgentEndpointFactory: http://twistedmatrix.com/documents/current/api/twisted.web.iweb.IAgentEndpointFactory.html .. |SOCKS5ClientEndpoint| replace:: ``SOCKS5ClientEndpoint`` .. |SOCKS5Agent| replace:: ``SOCKS5Agent`` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/txsocksx-1.13.0.3/txsocksx/_version.py new/txsocksx-1.15.0.2/txsocksx/_version.py --- old/txsocksx-1.13.0.3/txsocksx/_version.py 2014-05-06 18:20:58.000000000 +0200 +++ new/txsocksx-1.15.0.2/txsocksx/_version.py 2015-08-03 19:18:19.000000000 +0200 @@ -1,5 +1,5 @@ # This file is automatically generated by setup.py. -__version__ = '1.13.0.3' -__sha__ = 'g1fb0462' -__revision__ = 'g1fb0462' +__version__ = '1.15.0.2' +__sha__ = 'g652cda7' +__revision__ = 'g652cda7' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/txsocksx-1.13.0.3/txsocksx/http.py new/txsocksx-1.15.0.2/txsocksx/http.py --- old/txsocksx-1.13.0.3/txsocksx/http.py 2014-05-06 08:13:32.000000000 +0200 +++ new/txsocksx-1.15.0.2/txsocksx/http.py 2015-06-12 22:36:32.000000000 +0200 @@ -8,18 +8,50 @@ """ +import twisted +from twisted.python.versions import Version from twisted.web.client import Agent, SchemeNotSupported from txsocksx.client import SOCKS4ClientEndpoint, SOCKS5ClientEndpoint from txsocksx.tls import TLSWrapClientEndpoint +_twisted_12_1 = Version('twisted', 12, 1, 0) +_twisted_14_0 = Version('twisted', 14, 0, 0) +_twisted_15_0 = Version('twisted', 15, 0, 0) + + +if twisted.version >= _twisted_15_0: + from twisted.web.client import BrowserLikePolicyForHTTPS + from twisted.web.iweb import IAgentEndpointFactory, IAgent, IPolicyForHTTPS + from zope.interface import implementer + + _Agent = Agent + + @implementer(IAgentEndpointFactory, IAgent) + class Agent(object): + def __init__(self, reactor, contextFactory=BrowserLikePolicyForHTTPS(), + connectTimeout=None, bindAddress=None, pool=None): + if not IPolicyForHTTPS.providedBy(contextFactory): + raise NotImplementedError( + 'contextFactory must implement IPolicyForHTTPS') + self._policyForHTTPS = contextFactory + self._wrappedAgent = _Agent.usingEndpointFactory( + reactor, self, pool=pool) + + def request(self, *a, **kw): + return self._wrappedAgent.request(*a, **kw) + + def endpointForURI(self, uri): + return self._getEndpoint(uri.scheme, uri.host, uri.port) + + class _SOCKSAgent(Agent): endpointFactory = None _tlsWrapper = TLSWrapClientEndpoint def __init__(self, *a, **kw): - if not hasattr(Agent, '_getEndpoint'): + if twisted.version < _twisted_12_1: raise NotImplementedError('txsocksx.http requires twisted 12.1 or greater') self.proxyEndpoint = kw.pop('proxyEndpoint') self.endpointArgs = kw.pop('endpointArgs', {}) @@ -31,9 +63,9 @@ endpoint = self.endpointFactory( host, port, self.proxyEndpoint, **self.endpointArgs) if scheme == 'https': - if hasattr(self, '_wrapContextFactory'): + if _twisted_12_1 <= twisted.version < _twisted_14_0: tlsPolicy = self._wrapContextFactory(host, port) - elif hasattr(self, '_policyForHTTPS'): + elif _twisted_14_0 <= twisted.version: tlsPolicy = self._policyForHTTPS.creatorForNetloc(host, port) else: raise NotImplementedError("can't figure out how to make a context factory") @@ -67,6 +99,12 @@ ignored and should be specified when constructing the *proxyEndpoint*. __ http://twistedmatrix.com/documents/current/api/twisted.web.client.Agent.html + + If used with Twisted 15.0 or greater, this class will also implement + `IAgentEndpointFactory`__. + + __ http://twistedmatrix.com/documents/current/api/twisted.web.iweb.IAgentEndpointFactory.html + .. |SOCKS5ClientEndpoint| replace:: ``SOCKS5ClientEndpoint`` """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/txsocksx-1.13.0.3/txsocksx/ssl.py new/txsocksx-1.15.0.2/txsocksx/ssl.py --- old/txsocksx-1.13.0.3/txsocksx/ssl.py 2013-10-06 17:50:23.000000000 +0200 +++ new/txsocksx-1.15.0.2/txsocksx/ssl.py 2015-06-12 22:36:23.000000000 +0200 @@ -30,7 +30,7 @@ :param contextFactory: A `ContextFactory`__ instance. :param wrappedEndpoint: The endpoint to wrap. - __ http://twistedmatrix.com/documents/current/api/twisted.internet.protocol.ClientFactory.html + __ http://twistedmatrix.com/documents/current/api/twisted.internet.ssl.ContextFactory.html """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/txsocksx-1.13.0.3/txsocksx.egg-info/PKG-INFO new/txsocksx-1.15.0.2/txsocksx.egg-info/PKG-INFO --- old/txsocksx-1.13.0.3/txsocksx.egg-info/PKG-INFO 2014-05-06 18:20:58.000000000 +0200 +++ new/txsocksx-1.15.0.2/txsocksx.egg-info/PKG-INFO 2015-08-03 19:18:19.000000000 +0200 @@ -1,15 +1,15 @@ Metadata-Version: 1.1 Name: txsocksx -Version: 1.13.0.3 +Version: 1.15.0.2 Summary: Twisted client endpoints for SOCKS{4,4a,5} Home-page: https://github.com/habnabit/txsocksx Author: Aaron Gallagher Author-email: _...@habnab.it License: ISC -Description: .. image:: https://travis-ci.org/habnabit/txsocksx.png +Description: .. image:: https://img.shields.io/travis/habnabit/txsocksx/master.svg?style=flat-square :target: https://travis-ci.org/habnabit/txsocksx - .. image:: https://coveralls.io/repos/habnabit/txsocksx/badge.png?branch=master + .. image:: https://img.shields.io/coveralls/habnabit/txsocksx/master.svg?style=flat-square :target: https://coveralls.io/r/habnabit/txsocksx?branch=master @@ -109,12 +109,9 @@ Making HTTP requests -------------------- - Twisted's builtin `Agent`_ HTTP client does not support being handed an - arbitrary endpoint. (Yet. `Ticket #6634`_ was filed to make this an API - directly supported by Twisted.) |txsocksx| provides an ``Agent`` as a - workaround, but it uses a private API. There are no guarantees that this - approach will run in newer versions of Twisted, but |txsocksx.http| will - attempt to provide a consistent API. + Twisted's builtin `Agent`_ HTTP client did not support being handed an + arbitrary endpoint before 15.0, so |txsocksx| provides an ``Agent`` for maximum + compatibility. While |txsocksx| requires only Twisted 10.1, |txsocksx.http| requires Twisted 12.1 or greater. Its usage is almost identical to normal ``Agent`` usage:: @@ -135,6 +132,9 @@ |SOCKS5Agent| transparently supports HTTPS via |TLSWrapClientEndpoint|. + For users with Twisted 15.0 or greater, |SOCKS5Agent| also implements + `IAgentEndpointFactory`_. + Upgrading to TLS ---------------- @@ -170,7 +170,7 @@ .. _Twisted endpoints: http://twistedmatrix.com/documents/current/core/howto/endpoints.html .. _IDelayedCall: http://twistedmatrix.com/documents/current/api/twisted.internet.interfaces.IDelayedCall.html .. _Agent: http://twistedmatrix.com/documents/current/web/howto/client.html - .. _Ticket #6634: https://twistedmatrix.com/trac/ticket/6634 + .. _IAgentEndpointFactory: http://twistedmatrix.com/documents/current/api/twisted.web.iweb.IAgentEndpointFactory.html .. |SOCKS5ClientEndpoint| replace:: ``SOCKS5ClientEndpoint`` .. |SOCKS5Agent| replace:: ``SOCKS5Agent`` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/txsocksx-1.13.0.3/txsocksx.egg-info/requires.txt new/txsocksx-1.15.0.2/txsocksx.egg-info/requires.txt --- old/txsocksx-1.13.0.3/txsocksx.egg-info/requires.txt 2014-05-06 18:20:58.000000000 +0200 +++ new/txsocksx-1.15.0.2/txsocksx.egg-info/requires.txt 2015-08-03 19:18:19.000000000 +0200 @@ -1,2 +1,2 @@ Twisted>=10.1 -Parsley>=1.2 \ No newline at end of file +Parsley>=1.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/txsocksx-1.13.0.3/version.txt new/txsocksx-1.15.0.2/version.txt --- old/txsocksx-1.13.0.3/version.txt 2014-05-06 18:20:58.000000000 +0200 +++ new/txsocksx-1.15.0.2/version.txt 2015-08-03 19:18:19.000000000 +0200 @@ -1 +1 @@ -1.13.0.3-0-g1fb0462 \ No newline at end of file +1.15.0.2-0-g652cda7 \ No newline at end of file
