Updated flexget and dependencies

This commit is contained in:
layman
2018-01-27 15:44:10 +01:00
parent a872d708e1
commit a748ae043e
30 changed files with 719 additions and 17 deletions
@@ -0,0 +1,17 @@
--- requests-2.12.1/setup.py
+++ requests-2.12.1/setup.py
@@ -36,14 +36,6 @@
packages = [
'requests',
'requests.packages',
- 'requests.packages.chardet',
- 'requests.packages.idna',
- 'requests.packages.urllib3',
- 'requests.packages.urllib3.packages',
- 'requests.packages.urllib3.contrib',
- 'requests.packages.urllib3.util',
- 'requests.packages.urllib3.packages.ssl_match_hostname',
- 'requests.packages.urllib3.packages.backports',
]
requires = []
@@ -0,0 +1,19 @@
--- requests-2.14.2/setup.py.old 2017-05-15 17:38:45.942532911 +0200
+++ requests-2.14.2/setup.py 2017-05-15 17:39:03.629533611 +0200
@@ -36,16 +36,6 @@
packages = [
'requests',
'requests.packages',
- 'requests.packages.chardet',
- 'requests.packages.chardet.cli',
- 'requests.packages.idna',
- 'requests.packages.urllib3',
- 'requests.packages.urllib3.packages',
- 'requests.packages.urllib3.contrib',
- 'requests.packages.urllib3.util',
- 'requests.packages.urllib3.packages.ssl_match_hostname',
- 'requests.packages.urllib3.packages.backports',
- 'requests.packages.urllib3.contrib._securetransport',
]
requires = []
@@ -0,0 +1,24 @@
--- requests-2.5.0/requests/certs.py
+++ requests-2.5.0/requests/certs.py
@@ -13,13 +13,14 @@
"""
import os.path
-try:
- from certifi import where
-except ImportError:
- def where():
- """Return the preferred certificate bundle."""
- # vendored bundle inside Requests
- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
+def where():
+ """Return the preferred certificate bundle."""
+ cacerts = '/etc/ssl/certs/ca-certificates.crt'
+ if os.path.exists(cacerts):
+ return cacerts
+
+ # vendored bundle inside Requests
+ return os.path.join(os.path.dirname(__file__), 'cacert.pem')
if __name__ == '__main__':
print(where())
@@ -0,0 +1,20 @@
setup.py | 6 ------
1 file changed, 6 deletions(-)
diff --git a/setup.py b/setup.py
index b7ed12b..1d5abe4 100755
--- a/setup.py
+++ b/setup.py
@@ -18,12 +18,6 @@ if sys.argv[-1] == 'publish':
packages = [
'requests',
'requests.packages',
- 'requests.packages.chardet',
- 'requests.packages.urllib3',
- 'requests.packages.urllib3.packages',
- 'requests.packages.urllib3.contrib',
- 'requests.packages.urllib3.util',
- 'requests.packages.urllib3.packages.ssl_match_hostname',
]
requires = []