[arch-commits] Commit in python-tornado/trunk (4 files)
Date: Sunday, July 17, 2016 @ 02:56:52
Author: felixonmars
Revision: 183011
upgpkg: python-tornado 4.4.0-1
Modified:
python-tornado/trunk/0001-use_system_ca_certificates.patch
python-tornado/trunk/PKGBUILD
Deleted:
python-tornado/trunk/0002-get-rid-of-backports-ssl-match-hostname.patch
python-tornado/trunk/0003-support-monotonic.patch
+
0001-use_system_ca_certificates.patch | 25 -
0002-get-rid-of-backports-ssl-match-hostname.patch | 23
0003-support-monotonic.patch | 52 ---
PKGBUILD | 12 +---
4 files changed, 4 insertions(+), 108 deletions(-)
Modified: 0001-use_system_ca_certificates.patch
===
--- 0001-use_system_ca_certificates.patch 2016-07-17 02:54:11 UTC (rev
183010)
+++ 0001-use_system_ca_certificates.patch 2016-07-17 02:56:52 UTC (rev
183011)
@@ -10,27 +10,4 @@
+pass
if sys.version_info < (3, 5):
install_requires.append('backports_abc>=0.4')
- kwargs['install_requires'] = install_requires
-diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
-index f0f73fa..ffe3e40 100644
a/tornado/simple_httpclient.py
-+++ b/tornado/simple_httpclient.py
-@@ -33,17 +33,9 @@ except ImportError:
- # ssl is not available on Google App Engine.
- ssl = None
-
--try:
--import certifi
--except ImportError:
--certifi = None
--
-
- def _default_ca_certs():
--if certifi is None:
--raise Exception("The 'certifi' package is required to use https "
--"in simple_httpclient")
--return certifi.where()
-+return "/etc/ssl/certs/ca-certificates.crt"
-
-
- class SimpleAsyncHTTPClient(AsyncHTTPClient):
+ kwargs['install_requires'] = install_requires
\ No newline at end of file
Deleted: 0002-get-rid-of-backports-ssl-match-hostname.patch
===
--- 0002-get-rid-of-backports-ssl-match-hostname.patch 2016-07-17 02:54:11 UTC
(rev 183010)
+++ 0002-get-rid-of-backports-ssl-match-hostname.patch 2016-07-17 02:56:52 UTC
(rev 183011)
@@ -1,23 +0,0 @@
-From f8f2ffca1928aeca2fa9771093436dba49baa538 Mon Sep 17 00:00:00 2001
-From: Felix Yan
-Date: Fri, 12 Dec 2014 23:10:15 +0800
-Subject: [PATCH] Don't depend on backports.ssl-match-hostname with python
- >=2.7.9, <3.0
-
- setup.py | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index f09169f..f795807 100644
a/setup.py
-+++ b/setup.py
-@@ -121,7 +121,7 @@ def build_extension(self, ext):
- if sys.version_info < (2, 7):
- # Only needed indirectly, for singledispatch.
- install_requires.append('ordereddict')
--if sys.version_info < (3, 2):
-+if sys.version_info < (2, 7, 9) or (3, 0) <= sys.version_info < (3, 2):
- install_requires.append('backports.ssl_match_hostname')
- if sys.version_info < (3, 4):
- install_requires.append('singledispatch')
\ No newline at end of file
Deleted: 0003-support-monotonic.patch
===
--- 0003-support-monotonic.patch2016-07-17 02:54:11 UTC (rev 183010)
+++ 0003-support-monotonic.patch2016-07-17 02:56:52 UTC (rev 183011)
@@ -1,52 +0,0 @@
-commit 7861716d2315606b03c4126505d6b158640218aa
-Author: Felix Yan
-Date: Sat Nov 7 13:53:09 2015 +0800
-
-Add monotonic as an alternative to Monotime
-
-diff --git a/docs/index.rst b/docs/index.rst
-index e4a4d80..14f9af6 100644
a/docs/index.rst
-+++ b/docs/index.rst
-@@ -100,6 +100,8 @@ the following optional packages may be useful:
- * `Monotime `_ adds support for
- a monotonic clock, which improves reliability in environments
- where clock adjustments are frequent. No longer needed in Python 3.3.
-+* `monotonic `_ adds support for
-+ a monotonic clock. Alternative to Monotime. No longer needed in Python 3.3.
-
- **Platforms**: Tornado should run on any Unix-like platform, although
- for the best performance and scalability only Linux (with ``epoll``)
-diff --git a/tornado/platform/auto.py b/tornado/platform/auto.py
-index fc40c9d..449b634 100644
a/tornado/platform/auto.py
-+++ b/tornado/platform/auto.py
-@@ -47,8 +47,13 @@ try:
- except ImportError:
- pass
- try:
--from time import monotonic as monotonic_time
-+# monotonic can provide a monotonic function in versions of python before
-+# 3.3, too.
-+from monotonic import monotonic as monotonic_time
- except ImportError:
--monotonic_time = None
-+try:
-+from time import monotonic as monotonic_time
-+except ImportError:
-+monotonic_time = None
-
-
[arch-commits] Commit in python-tornado/trunk (4 files)
Date: Saturday, November 7, 2015 @ 07:36:01
Author: fyan
Revision: 146344
upgpkg: python-tornado 4.3.0-1
Added:
python-tornado/trunk/0003-support-monotonic.patch
Modified:
python-tornado/trunk/0001-use_system_ca_certificates.patch
python-tornado/trunk/0002-get-rid-of-backports-ssl-match-hostname.patch
python-tornado/trunk/PKGBUILD
+
0001-use_system_ca_certificates.patch |6 +-
0002-get-rid-of-backports-ssl-match-hostname.patch | 10 +--
0003-support-monotonic.patch | 52 ++
PKGBUILD | 54 ++-
4 files changed, 91 insertions(+), 31 deletions(-)
Modified: 0001-use_system_ca_certificates.patch
===
--- 0001-use_system_ca_certificates.patch 2015-11-07 05:46:13 UTC (rev
146343)
+++ 0001-use_system_ca_certificates.patch 2015-11-07 06:36:01 UTC (rev
146344)
@@ -8,9 +8,9 @@
# until we have more declarative metadata.
-install_requires.append('certifi')
+pass
- kwargs['install_requires'] = install_requires
-
- setup(
+ if sys.version_info < (3, 5):
+ install_requires.append('backports_abc>=0.4')
+ kwargs['install_requires'] = install_requires
diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index f0f73fa..ffe3e40 100644
--- a/tornado/simple_httpclient.py
Modified: 0002-get-rid-of-backports-ssl-match-hostname.patch
===
--- 0002-get-rid-of-backports-ssl-match-hostname.patch 2015-11-07 05:46:13 UTC
(rev 146343)
+++ 0002-get-rid-of-backports-ssl-match-hostname.patch 2015-11-07 06:36:01 UTC
(rev 146344)
@@ -13,11 +13,11 @@
--- a/setup.py
+++ b/setup.py
@@ -121,7 +121,7 @@ def build_extension(self, ext):
- if setuptools is not None:
- # If setuptools is not available, you're on your own for dependencies.
- install_requires = []
+ if sys.version_info < (2, 7):
+ # Only needed indirectly, for singledispatch.
+ install_requires.append('ordereddict')
-if sys.version_info < (3, 2):
+if sys.version_info < (2, 7, 9) or (3, 0) <= sys.version_info < (3, 2):
install_requires.append('backports.ssl_match_hostname')
- kwargs['install_requires'] = install_requires
-
+ if sys.version_info < (3, 4):
+ install_requires.append('singledispatch')
\ No newline at end of file
Added: 0003-support-monotonic.patch
===
--- 0003-support-monotonic.patch(rev 0)
+++ 0003-support-monotonic.patch2015-11-07 06:36:01 UTC (rev 146344)
@@ -0,0 +1,52 @@
+commit 7861716d2315606b03c4126505d6b158640218aa
+Author: Felix Yan
+Date: Sat Nov 7 13:53:09 2015 +0800
+
+Add monotonic as an alternative to Monotime
+
+diff --git a/docs/index.rst b/docs/index.rst
+index e4a4d80..14f9af6 100644
+--- a/docs/index.rst
b/docs/index.rst
+@@ -100,6 +100,8 @@ the following optional packages may be useful:
+ * `Monotime `_ adds support for
+ a monotonic clock, which improves reliability in environments
+ where clock adjustments are frequent. No longer needed in Python 3.3.
++* `monotonic `_ adds support for
++ a monotonic clock. Alternative to Monotime. No longer needed in Python 3.3.
+
+ **Platforms**: Tornado should run on any Unix-like platform, although
+ for the best performance and scalability only Linux (with ``epoll``)
+diff --git a/tornado/platform/auto.py b/tornado/platform/auto.py
+index fc40c9d..449b634 100644
+--- a/tornado/platform/auto.py
b/tornado/platform/auto.py
+@@ -47,8 +47,13 @@ try:
+ except ImportError:
+ pass
+ try:
+-from time import monotonic as monotonic_time
++# monotonic can provide a monotonic function in versions of python before
++# 3.3, too.
++from monotonic import monotonic as monotonic_time
+ except ImportError:
+-monotonic_time = None
++try:
++from time import monotonic as monotonic_time
++except ImportError:
++monotonic_time = None
+
+ __all__ = ['Waker', 'set_close_exec', 'monotonic_time']
+diff --git a/tox.ini b/tox.ini
+index 82b156d..6f74a74 100644
+--- a/tox.ini
b/tox.ini
+@@ -85,7 +85,7 @@ deps =
+ {py2,py27,pypy,py3,py33}-full: singledispatch
+ py33-asyncio: asyncio
+ trollius: trollius
+- py2-monotonic: Monotime
++ py2-monotonic: monotonic
+ sphinx: sphinx
+ sphinx: sphinx_rtd_theme
+
Modified: PKGBUILD
===
--- PKGBUILD2015-11-07 05:46:13 UTC (rev 146343)
+++ PKGBUILD2015-11-07 06:36:01 UTC (rev 146344)
@@ -3,25 +3,30 @@
# Contributor: Thomas Dziedzic < gostrc at gmail >
[arch-commits] Commit in python-tornado/trunk (4 files)
Date: Tuesday, December 16, 2014 @ 05:00:24
Author: fyan
Revision: 123935
upgpkg: python-tornado 4.0.2-2
use python2 2.7.9's new ssl library instead of backports.ssl-match-hostname
Added:
python-tornado/trunk/0001-use_system_ca_certificates.patch
(from rev 123837, python-tornado/trunk/use_system_ca_certificates.patch)
python-tornado/trunk/0002-get-rid-of-backports-ssl-match-hostname.patch
Modified:
python-tornado/trunk/PKGBUILD
Deleted:
python-tornado/trunk/use_system_ca_certificates.patch
+
0001-use_system_ca_certificates.patch | 57 +++
0002-get-rid-of-backports-ssl-match-hostname.patch | 23 +++
PKGBUILD | 19 --
use_system_ca_certificates.patch | 57 ---
4 files changed, 92 insertions(+), 64 deletions(-)
Copied: python-tornado/trunk/0001-use_system_ca_certificates.patch (from rev
123837, python-tornado/trunk/use_system_ca_certificates.patch)
===
--- 0001-use_system_ca_certificates.patch (rev 0)
+++ 0001-use_system_ca_certificates.patch 2014-12-16 04:00:24 UTC (rev
123935)
@@ -0,0 +1,57 @@
+diff --git a/setup.py b/setup.py
+index f09169f..d42c486 100644
+--- a/setup.py
b/setup.py
+@@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and
+
+ if setuptools is not None:
+ # If setuptools is not available, you're on your own for dependencies.
+-install_requires = ['certifi']
++install_requires = []
+ if sys.version_info (3, 2):
+ install_requires.append('backports.ssl_match_hostname')
+ kwargs['install_requires'] = install_requires
+diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
+index f0f73fa..ffe3e40 100644
+--- a/tornado/simple_httpclient.py
b/tornado/simple_httpclient.py
+@@ -33,17 +33,9 @@ except ImportError:
+ # ssl is not available on Google App Engine.
+ ssl = None
+
+-try:
+-import certifi
+-except ImportError:
+-certifi = None
+-
+
+ def _default_ca_certs():
+-if certifi is None:
+-raise Exception(The 'certifi' package is required to use https
+-in simple_httpclient)
+-return certifi.where()
++return /etc/ssl/certs/ca-certificates.crt
+
+
+ class SimpleAsyncHTTPClient(AsyncHTTPClient):
+diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
+index 01b0d95..47a64e7 100644
+--- a/tornado/test/iostream_test.py
b/tornado/test/iostream_test.py
+@@ -10,7 +10,6 @@ from tornado.stack_context import NullContext
+ from tornado.testing import AsyncHTTPTestCase, AsyncHTTPSTestCase,
AsyncTestCase, bind_unused_port, ExpectLog, gen_test
+ from tornado.test.util import unittest, skipIfNonUnix
+ from tornado.web import RequestHandler, Application
+-import certifi
+ import errno
+ import logging
+ import os
+@@ -855,7 +854,7 @@ class TestIOStreamStartTLS(AsyncTestCase):
+ def test_handshake_fail(self):
+ self.server_start_tls(_server_ssl_options())
+ client_future = self.client_start_tls(
+-dict(cert_reqs=ssl.CERT_REQUIRED, ca_certs=certifi.where()))
++dict(cert_reqs=ssl.CERT_REQUIRED,
ca_certs=/etc/ssl/certs/ca-certificates.crt))
+ with ExpectLog(gen_log, SSL Error):
+ with self.assertRaises(ssl.SSLError):
+ yield client_future
Added: 0002-get-rid-of-backports-ssl-match-hostname.patch
===
--- 0002-get-rid-of-backports-ssl-match-hostname.patch
(rev 0)
+++ 0002-get-rid-of-backports-ssl-match-hostname.patch 2014-12-16 04:00:24 UTC
(rev 123935)
@@ -0,0 +1,23 @@
+From f8f2ffca1928aeca2fa9771093436dba49baa538 Mon Sep 17 00:00:00 2001
+From: Felix Yan felixonm...@gmail.com
+Date: Fri, 12 Dec 2014 23:10:15 +0800
+Subject: [PATCH] Don't depend on backports.ssl-match-hostname with python
+ =2.7.9, 3.0
+
+---
+ setup.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f09169f..f795807 100644
+--- a/setup.py
b/setup.py
+@@ -121,7 +121,7 @@ def build_extension(self, ext):
+ if setuptools is not None:
+ # If setuptools is not available, you're on your own for dependencies.
+ install_requires = []
+-if sys.version_info (3, 2):
++if sys.version_info (2, 7, 9) or (3, 0) = sys.version_info (3, 2):
+ install_requires.append('backports.ssl_match_hostname')
+ kwargs['install_requires'] = install_requires
+
Modified: PKGBUILD
===
--- PKGBUILD2014-12-16 01:32:38 UTC (rev 123934)
+++ PKGBUILD2014-12-16 04:00:24 UTC (rev 123935)
@@ -1,24 +1,27 @@
# $Id$
-# Maintainer: Felix Yan felixonm...@gmail.com
+# Maintainer: Felix Yan
