[arch-commits] Commit in python-tornado/trunk (2 files)

[Felix Yan]

    Date: Wednesday, May 27, 2015 @ 10:22:05
  Author: fyan
Revision: 134217

upgpkg: python-tornado 4.2.0-1

Modified:
  python-tornado/trunk/0001-use_system_ca_certificates.patch
  python-tornado/trunk/PKGBUILD

---------------------------------------+
 0001-use_system_ca_certificates.patch |   35 ++++++--------------------------
 PKGBUILD                              |    6 ++---
 2 files changed, 10 insertions(+), 31 deletions(-)

Modified: 0001-use_system_ca_certificates.patch
===================================================================
--- 0001-use_system_ca_certificates.patch	2015-05-27 08:05:38 UTC (rev 134216)
+++ 0001-use_system_ca_certificates.patch	2015-05-27 08:22:05 UTC (rev 134217)
@@ -3,14 +3,14 @@
 --- a/setup.py
 +++ b/setup.py
 @@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and
+         # Certifi is also optional on 2.7.9+, although making our dependencies
+         # conditional on micro version numbers seems like a bad idea
+         # until we have more declarative metadata.
+-        install_requires.append('certifi')
++        pass
+     kwargs['install_requires'] = install_requires
  
- 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
+ setup(
 diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
 index f0f73fa..ffe3e40 100644
 --- a/tornado/simple_httpclient.py
@@ -34,24 +34,3 @@
  
  
  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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-27 08:05:38 UTC (rev 134216)
+++ PKGBUILD	2015-05-27 08:22:05 UTC (rev 134217)
@@ -3,8 +3,8 @@
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 
 pkgname=('python-tornado' 'python2-tornado')
-pkgver=4.1.0
-pkgrel=2
+pkgver=4.2.0
+pkgrel=1
 pkgdesc='open source version of the scalable, non-blocking web server and tools'
 arch=('i686' 'x86_64')
 url='http://www.tornadoweb.org/'
@@ -15,7 +15,7 @@
         0001-use_system_ca_certificates.patch
         0002-get-rid-of-backports-ssl-match-hostname.patch)
 sha512sums=('SKIP'
-            '6e50e9ecf361d54d9f67e1f12185cf58863ad0eae72fbe7cc24e8eaf94874255009a030249bb51adf06e98c7ed0b17d8c6d9ee65190ebc341d6857c0efbc7840'
+            '7d484e811c7de62d2f2d38595abc5edf8f6cbdfc8a983229d4ad6b67cadf00f101acaee88bfa4337b14b5a234ebaacc72036ccafca3596eac5f64298a1e30d54'
             '798f1c5f659138aa4d775edde7c962ec6410671f528b7ec44ca12ac342ddf9ec51d998c676b9025292a58c2140ba8492fcc76759b63adaf08320f96b11bcbfea')
 
 prepare() {