[Python-modules-commits] r32741 - in packages/python-tornado/trunk/debian/patches (3 files)

[jpuydt-guest at users.alioth.debian.org]

    Date: Wednesday, May 20, 2015 @ 14:46:37
  Author: jpuydt-guest
Revision: 32741

Remove outdated patches

Modified:
  packages/python-tornado/trunk/debian/patches/series
Deleted:
  packages/python-tornado/trunk/debian/patches/certs-path.patch
  packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch

Deleted: packages/python-tornado/trunk/debian/patches/certs-path.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/certs-path.patch	2015-05-20 14:46:31 UTC (rev 32740)
+++ packages/python-tornado/trunk/debian/patches/certs-path.patch	2015-05-20 14:46:37 UTC (rev 32741)
@@ -1,17 +0,0 @@
-Description: Looks for ca-certificates.crt at the good Debian location before trying local path
-Author: Carl Chenet <chaica at ohmytux.com>
-
---- a/tornado/simple_httpclient.py
-+++ b/tornado/simple_httpclient.py
-@@ -30,7 +30,10 @@ try:
- except ImportError:
-     import urllib.parse as urlparse  # py3
- 
--_DEFAULT_CA_CERTS = os.path.dirname(__file__) + '/ca-certificates.crt'
-+if os.path.exists('/etc/ssl/certs/ca-certificates.crt'):
-+    _DEFAULT_CA_CERTS = '/etc/ssl/certs/ca-certificates.crt'
-+else:
-+    _DEFAULT_CA_CERTS = os.path.dirname(__file__) + '/ca-certificates.crt'
- 
- 
- class SimpleAsyncHTTPClient(AsyncHTTPClient):

Deleted: packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch	2015-05-20 14:46:31 UTC (rev 32740)
+++ packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch	2015-05-20 14:46:37 UTC (rev 32741)
@@ -1,14 +0,0 @@
-Description: Remove the ca-certificate file from being added to the package
-Author: Carl Chenet <chaica at ohmytux.com>
-
---- a/setup.py
-+++ b/setup.py
-@@ -35,7 +35,7 @@ distutils.core.setup(
-     version=version,
-     packages = ["tornado", "tornado.test", "tornado.platform"],
-     package_data = {
--        "tornado": ["ca-certificates.crt"],
-+        #"tornado": ["ca-certificates.crt"],
-         # data files need to be listed both here (which determines what gets
-         # installed) and in MANIFEST.in (which determines what gets included
-         # in the sdist tarball)

Modified: packages/python-tornado/trunk/debian/patches/series
===================================================================
--- packages/python-tornado/trunk/debian/patches/series	2015-05-20 14:46:31 UTC (rev 32740)
+++ packages/python-tornado/trunk/debian/patches/series	2015-05-20 14:46:37 UTC (rev 32741)
@@ -1,5 +1,3 @@
-ignore-ca-certificates.patch
-certs-path.patch
 ignoreuserwarning.patch
 domain-test.patch
 skip-timing-tests.patch