From 919064200b9f936ffd8d14bcf1205ed81fe201c9 Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Tue, 31 Mar 2015 15:44:48 -0700 Subject: [PATCH] update wakatime cli to v4.0.6 --- packages/wakatime/__about__.py | 2 +- packages/wakatime/base.py | 3 +- packages/wakatime/log.py | 3 ++ .../wakatime/packages/requests/__init__.py | 2 +- .../wakatime/packages/requests/adapters.py | 2 +- packages/wakatime/packages/requests/api.py | 31 ++++++++++++++----- packages/wakatime/packages/requests/models.py | 17 ++++++---- .../requests/packages/urllib3/__init__.py | 2 +- .../requests/packages/urllib3/_collections.py | 27 ++++++++-------- .../requests/packages/urllib3/exceptions.py | 5 +++ .../requests/packages/urllib3/util/ssl_.py | 11 ++++++- .../wakatime/packages/requests/sessions.py | 5 ++- 12 files changed, 76 insertions(+), 34 deletions(-) diff --git a/packages/wakatime/__about__.py b/packages/wakatime/__about__.py index 11f1bbf..a6ce7ee 100644 --- a/packages/wakatime/__about__.py +++ b/packages/wakatime/__about__.py @@ -1,7 +1,7 @@ __title__ = 'wakatime' __description__ = 'Common interface to the WakaTime api.' __url__ = 'https://github.com/wakatime/wakatime' -__version_info__ = ('4', '0', '4') +__version_info__ = ('4', '0', '6') __version__ = '.'.join(__version_info__) __author__ = 'Alan Hamlett' __author_email__ = 'alan@wakatime.com' diff --git a/packages/wakatime/base.py b/packages/wakatime/base.py index 71b2a90..58dc9ea 100644 --- a/packages/wakatime/base.py +++ b/packages/wakatime/base.py @@ -24,8 +24,9 @@ try: except ImportError: import configparser -sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) +sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'packages')) +sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'packages', 'requests', 'packages')) from .__about__ import __version__ from .compat import u, open, is_py3 diff --git a/packages/wakatime/log.py b/packages/wakatime/log.py index 822d048..7cec4a2 100644 --- a/packages/wakatime/log.py +++ b/packages/wakatime/log.py @@ -24,6 +24,9 @@ except ImportError: class CustomEncoder(json.JSONEncoder): def default(self, obj): + if isinstance(obj, bytes): + obj = bytes.decode(obj) + return json.dumps(obj) try: encoded = super(CustomEncoder, self).default(obj) except UnicodeDecodeError: diff --git a/packages/wakatime/packages/requests/__init__.py b/packages/wakatime/packages/requests/__init__.py index b90d792..446500b 100644 --- a/packages/wakatime/packages/requests/__init__.py +++ b/packages/wakatime/packages/requests/__init__.py @@ -42,7 +42,7 @@ is at . """ __title__ = 'requests' -__version__ = '2.5.3' +__version__ = '2.6.0' __build__ = 0x020503 __author__ = 'Kenneth Reitz' __license__ = 'Apache 2.0' diff --git a/packages/wakatime/packages/requests/adapters.py b/packages/wakatime/packages/requests/adapters.py index c892853..02e0dd1 100644 --- a/packages/wakatime/packages/requests/adapters.py +++ b/packages/wakatime/packages/requests/adapters.py @@ -11,10 +11,10 @@ and maintain connections. import socket from .models import Response -from .packages.urllib3 import Retry from .packages.urllib3.poolmanager import PoolManager, proxy_from_url from .packages.urllib3.response import HTTPResponse from .packages.urllib3.util import Timeout as TimeoutSauce +from .packages.urllib3.util.retry import Retry from .compat import urlparse, basestring from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, prepend_scheme_if_needed, get_auth_from_url, urldefragauth) diff --git a/packages/wakatime/packages/requests/api.py b/packages/wakatime/packages/requests/api.py index 1469b05..98c9229 100644 --- a/packages/wakatime/packages/requests/api.py +++ b/packages/wakatime/packages/requests/api.py @@ -16,7 +16,6 @@ from . import sessions def request(method, url, **kwargs): """Constructs and sends a :class:`Request `. - Returns :class:`Response ` object. :param method: method for the new :class:`Request` object. :param url: URL for the new :class:`Request` object. @@ -37,6 +36,8 @@ def request(method, url, **kwargs): :param verify: (optional) if ``True``, the SSL cert will be verified. A CA_BUNDLE path can also be provided. :param stream: (optional) if ``False``, the response content will be immediately downloaded. :param cert: (optional) if String, path to ssl client cert file (.pem). If Tuple, ('cert', 'key') pair. + :return: :class:`Response ` object + :rtype: requests.Response Usage:: @@ -55,10 +56,12 @@ def request(method, url, **kwargs): def get(url, **kwargs): - """Sends a GET request. Returns :class:`Response` object. + """Sends a GET request. :param url: URL for the new :class:`Request` object. :param \*\*kwargs: Optional arguments that ``request`` takes. + :return: :class:`Response ` object + :rtype: requests.Response """ kwargs.setdefault('allow_redirects', True) @@ -66,10 +69,12 @@ def get(url, **kwargs): def options(url, **kwargs): - """Sends a OPTIONS request. Returns :class:`Response` object. + """Sends a OPTIONS request. :param url: URL for the new :class:`Request` object. :param \*\*kwargs: Optional arguments that ``request`` takes. + :return: :class:`Response ` object + :rtype: requests.Response """ kwargs.setdefault('allow_redirects', True) @@ -77,10 +82,12 @@ def options(url, **kwargs): def head(url, **kwargs): - """Sends a HEAD request. Returns :class:`Response` object. + """Sends a HEAD request. :param url: URL for the new :class:`Request` object. :param \*\*kwargs: Optional arguments that ``request`` takes. + :return: :class:`Response ` object + :rtype: requests.Response """ kwargs.setdefault('allow_redirects', False) @@ -88,44 +95,52 @@ def head(url, **kwargs): def post(url, data=None, json=None, **kwargs): - """Sends a POST request. Returns :class:`Response` object. + """Sends a POST request. :param url: URL for the new :class:`Request` object. :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`. :param json: (optional) json data to send in the body of the :class:`Request`. :param \*\*kwargs: Optional arguments that ``request`` takes. + :return: :class:`Response ` object + :rtype: requests.Response """ return request('post', url, data=data, json=json, **kwargs) def put(url, data=None, **kwargs): - """Sends a PUT request. Returns :class:`Response` object. + """Sends a PUT request. :param url: URL for the new :class:`Request` object. :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`. :param \*\*kwargs: Optional arguments that ``request`` takes. + :return: :class:`Response ` object + :rtype: requests.Response """ return request('put', url, data=data, **kwargs) def patch(url, data=None, **kwargs): - """Sends a PATCH request. Returns :class:`Response` object. + """Sends a PATCH request. :param url: URL for the new :class:`Request` object. :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`. :param \*\*kwargs: Optional arguments that ``request`` takes. + :return: :class:`Response ` object + :rtype: requests.Response """ return request('patch', url, data=data, **kwargs) def delete(url, **kwargs): - """Sends a DELETE request. Returns :class:`Response` object. + """Sends a DELETE request. :param url: URL for the new :class:`Request` object. :param \*\*kwargs: Optional arguments that ``request`` takes. + :return: :class:`Response ` object + :rtype: requests.Response """ return request('delete', url, **kwargs) diff --git a/packages/wakatime/packages/requests/models.py b/packages/wakatime/packages/requests/models.py index ce1eb40..cb153aa 100644 --- a/packages/wakatime/packages/requests/models.py +++ b/packages/wakatime/packages/requests/models.py @@ -143,12 +143,13 @@ class RequestEncodingMixin(object): else: fn = guess_filename(v) or k fp = v - if isinstance(fp, str): - fp = StringIO(fp) - if isinstance(fp, (bytes, bytearray)): - fp = BytesIO(fp) - rf = RequestField(name=k, data=fp.read(), + if isinstance(fp, (str, bytes, bytearray)): + fdata = fp + else: + fdata = fp.read() + + rf = RequestField(name=k, data=fdata, filename=fn, headers=fh) rf.make_multipart(content_type=ft) new_fields.append(rf) @@ -572,7 +573,11 @@ class Response(object): self.cookies = cookiejar_from_dict({}) #: The amount of time elapsed between sending the request - #: and the arrival of the response (as a timedelta) + #: and the arrival of the response (as a timedelta). + #: This property specifically measures the time taken between sending + #: the first byte of the request and finishing parsing the headers. It + #: is therefore unaffected by consuming the response content or the + #: value of the ``stream`` keyword argument. self.elapsed = datetime.timedelta(0) #: The :class:`PreparedRequest ` object to which this diff --git a/packages/wakatime/packages/requests/packages/urllib3/__init__.py b/packages/wakatime/packages/requests/packages/urllib3/__init__.py index d7592ae..0660b9c 100644 --- a/packages/wakatime/packages/requests/packages/urllib3/__init__.py +++ b/packages/wakatime/packages/requests/packages/urllib3/__init__.py @@ -4,7 +4,7 @@ urllib3 - Thread-safe connection pooling and re-using. __author__ = 'Andrey Petrov (andrey.petrov@shazow.net)' __license__ = 'MIT' -__version__ = 'dev' +__version__ = '1.10.2' from .connectionpool import ( diff --git a/packages/wakatime/packages/requests/packages/urllib3/_collections.py b/packages/wakatime/packages/requests/packages/urllib3/_collections.py index 06412dd..cc424de 100644 --- a/packages/wakatime/packages/requests/packages/urllib3/_collections.py +++ b/packages/wakatime/packages/requests/packages/urllib3/_collections.py @@ -20,8 +20,6 @@ from .packages.six import iterkeys, itervalues, PY3 __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict'] -MULTIPLE_HEADERS_ALLOWED = frozenset(['cookie', 'set-cookie', 'set-cookie2']) - _Null = object() @@ -143,7 +141,10 @@ class HTTPHeaderDict(dict): def __init__(self, headers=None, **kwargs): dict.__init__(self) if headers is not None: - self.extend(headers) + if isinstance(headers, HTTPHeaderDict): + self._copy_from(headers) + else: + self.extend(headers) if kwargs: self.extend(kwargs) @@ -223,11 +224,8 @@ class HTTPHeaderDict(dict): vals.append(val) else: # vals should be a tuple then, i.e. only one item so far - if key_lower in MULTIPLE_HEADERS_ALLOWED: - # Need to convert the tuple to list for further extension - _dict_setitem(self, key_lower, [vals[0], vals[1], val]) - else: - _dict_setitem(self, key_lower, new_vals) + # Need to convert the tuple to list for further extension + _dict_setitem(self, key_lower, [vals[0], vals[1], val]) def extend(*args, **kwargs): """Generic import function for any type of header-like object. @@ -276,14 +274,17 @@ class HTTPHeaderDict(dict): def __repr__(self): return "%s(%s)" % (type(self).__name__, dict(self.itermerged())) - def copy(self): - clone = type(self)() - for key in self: - val = _dict_getitem(self, key) + def _copy_from(self, other): + for key in other: + val = _dict_getitem(other, key) if isinstance(val, list): # Don't need to convert tuples val = list(val) - _dict_setitem(clone, key, val) + _dict_setitem(self, key, val) + + def copy(self): + clone = type(self)() + clone._copy_from(self) return clone def iteritems(self): diff --git a/packages/wakatime/packages/requests/packages/urllib3/exceptions.py b/packages/wakatime/packages/requests/packages/urllib3/exceptions.py index 0c6fd3c..5d52301 100644 --- a/packages/wakatime/packages/requests/packages/urllib3/exceptions.py +++ b/packages/wakatime/packages/requests/packages/urllib3/exceptions.py @@ -157,3 +157,8 @@ class InsecureRequestWarning(SecurityWarning): class SystemTimeWarning(SecurityWarning): "Warned when system time is suspected to be wrong" pass + + +class InsecurePlatformWarning(SecurityWarning): + "Warned when certain SSL configuration is not available on a platform." + pass diff --git a/packages/wakatime/packages/requests/packages/urllib3/util/ssl_.py b/packages/wakatime/packages/requests/packages/urllib3/util/ssl_.py index ee1d322..e7e7dfa 100644 --- a/packages/wakatime/packages/requests/packages/urllib3/util/ssl_.py +++ b/packages/wakatime/packages/requests/packages/urllib3/util/ssl_.py @@ -1,7 +1,7 @@ from binascii import hexlify, unhexlify from hashlib import md5, sha1, sha256 -from ..exceptions import SSLError +from ..exceptions import SSLError, InsecurePlatformWarning SSLContext = None @@ -10,6 +10,7 @@ create_default_context = None import errno import ssl +import warnings try: # Test for SSL features from ssl import wrap_socket, CERT_NONE, PROTOCOL_SSLv23 @@ -69,6 +70,14 @@ except ImportError: self.ciphers = cipher_suite def wrap_socket(self, socket, server_hostname=None): + warnings.warn( + 'A true SSLContext object is not available. This prevents ' + 'urllib3 from configuring SSL appropriately and may cause ' + 'certain SSL connections to fail. For more information, see ' + 'https://urllib3.readthedocs.org/en/latest/security.html' + '#insecureplatformwarning.', + InsecurePlatformWarning + ) kwargs = { 'keyfile': self.keyfile, 'certfile': self.certfile, diff --git a/packages/wakatime/packages/requests/sessions.py b/packages/wakatime/packages/requests/sessions.py index 4f30696..ef3f22b 100644 --- a/packages/wakatime/packages/requests/sessions.py +++ b/packages/wakatime/packages/requests/sessions.py @@ -171,7 +171,10 @@ class SessionRedirectMixin(object): except KeyError: pass - extract_cookies_to_jar(prepared_request._cookies, prepared_request, resp.raw) + # Extract any cookies sent on the response to the cookiejar + # in the new request. Because we've mutated our copied prepared + # request, use the old one that we haven't yet touched. + extract_cookies_to_jar(prepared_request._cookies, req, resp.raw) prepared_request._cookies.update(self.cookies) prepared_request.prepare_cookies(prepared_request._cookies)