`_.
+ None will set an infinite timeout.
+
+ :type read: integer, float, or None
+
+ :param total:
+ This combines the connect and read timeouts into one; the read timeout
+ will be set to the time leftover from the connect attempt. In the
+ event that both a connect timeout and a total are specified, or a read
+ timeout and a total are specified, the shorter timeout will be applied.
+
+ Defaults to None.
+
+ :type total: integer, float, or None
+
+ .. note::
+
+ Many factors can affect the total amount of time for urllib3 to return
+ an HTTP response. Specifically, Python's DNS resolver does not obey the
+ timeout specified on the socket. Other factors that can affect total
+ request time include high CPU load, high swap, the program running at a
+ low priority level, or other behaviors. The observed running time for
+ urllib3 to return a response may be greater than the value passed to
+ `total`.
+
+ In addition, the read and total timeouts only measure the time between
+ read operations on the socket connecting the client and the server,
+ not the total amount of time for the request to return a complete
+ response. For most requests, the timeout is raised because the server
+ has not sent the first byte in the specified time. This is not always
+ the case; if a server streams one byte every fifteen seconds, a timeout
+ of 20 seconds will not ever trigger, even though the request will
+ take several minutes to complete.
+
+ If your goal is to cut off any request after a set amount of wall clock
+ time, consider having a second "watcher" thread to cut off a slow
+ request.
+ """
+
+ #: A sentinel object representing the default timeout value
+ DEFAULT_TIMEOUT = _GLOBAL_DEFAULT_TIMEOUT
+
+ def __init__(self, total=None, connect=_Default, read=_Default):
+ self._connect = self._validate_timeout(connect, 'connect')
+ self._read = self._validate_timeout(read, 'read')
+ self.total = self._validate_timeout(total, 'total')
+ self._start_connect = None
+
+ def __str__(self):
+ return '%s(connect=%r, read=%r, total=%r)' % (
+ type(self).__name__, self._connect, self._read, self.total)
+
+
+ @classmethod
+ def _validate_timeout(cls, value, name):
+ """ Check that a timeout attribute is valid
+
+ :param value: The timeout value to validate
+ :param name: The name of the timeout attribute to validate. This is used
+ for clear error messages
+ :return: the value
+ :raises ValueError: if the type is not an integer or a float, or if it
+ is a numeric value less than zero
+ """
+ if value is _Default:
+ return cls.DEFAULT_TIMEOUT
+
+ if value is None or value is cls.DEFAULT_TIMEOUT:
+ return value
+
+ try:
+ float(value)
+ except (TypeError, ValueError):
+ raise ValueError("Timeout value %s was %s, but it must be an "
+ "int or float." % (name, value))
+
+ try:
+ if value < 0:
+ raise ValueError("Attempted to set %s timeout to %s, but the "
+ "timeout cannot be set to a value less "
+ "than 0." % (name, value))
+ except TypeError: # Python 3
+ raise ValueError("Timeout value %s was %s, but it must be an "
+ "int or float." % (name, value))
+
+ return value
+
+ @classmethod
+ def from_float(cls, timeout):
+ """ Create a new Timeout from a legacy timeout value.
+
+ The timeout value used by httplib.py sets the same timeout on the
+ connect(), and recv() socket requests. This creates a :class:`Timeout`
+ object that sets the individual timeouts to the ``timeout`` value passed
+ to this function.
+
+ :param timeout: The legacy timeout value
+ :type timeout: integer, float, sentinel default object, or None
+ :return: a Timeout object
+ :rtype: :class:`Timeout`
+ """
+ return Timeout(read=timeout, connect=timeout)
+
+ def clone(self):
+ """ Create a copy of the timeout object
+
+ Timeout properties are stored per-pool but each request needs a fresh
+ Timeout object to ensure each one has its own start/stop configured.
+
+ :return: a copy of the timeout object
+ :rtype: :class:`Timeout`
+ """
+ # We can't use copy.deepcopy because that will also create a new object
+ # for _GLOBAL_DEFAULT_TIMEOUT, which socket.py uses as a sentinel to
+ # detect the user default.
+ return Timeout(connect=self._connect, read=self._read,
+ total=self.total)
+
+ def start_connect(self):
+ """ Start the timeout clock, used during a connect() attempt
+
+ :raises urllib3.exceptions.TimeoutStateError: if you attempt
+ to start a timer that has been started already.
+ """
+ if self._start_connect is not None:
+ raise TimeoutStateError("Timeout timer has already been started.")
+ self._start_connect = current_time()
+ return self._start_connect
+
+ def get_connect_duration(self):
+ """ Gets the time elapsed since the call to :meth:`start_connect`.
+
+ :return: the elapsed time
+ :rtype: float
+ :raises urllib3.exceptions.TimeoutStateError: if you attempt
+ to get duration for a timer that hasn't been started.
+ """
+ if self._start_connect is None:
+ raise TimeoutStateError("Can't get connect duration for timer "
+ "that has not started.")
+ return current_time() - self._start_connect
+
+ @property
+ def connect_timeout(self):
+ """ Get the value to use when setting a connection timeout.
+
+ This will be a positive float or integer, the value None
+ (never timeout), or the default system timeout.
+
+ :return: the connect timeout
+ :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
+ """
+ if self.total is None:
+ return self._connect
+
+ if self._connect is None or self._connect is self.DEFAULT_TIMEOUT:
+ return self.total
+
+ return min(self._connect, self.total)
+
+ @property
+ def read_timeout(self):
+ """ Get the value for the read timeout.
+
+ This assumes some time has elapsed in the connection timeout and
+ computes the read timeout appropriately.
+
+ If self.total is set, the read timeout is dependent on the amount of
+ time taken by the connect timeout. If the connection time has not been
+ established, a :exc:`~urllib3.exceptions.TimeoutStateError` will be
+ raised.
+
+ :return: the value to use for the read timeout
+ :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
+ :raises urllib3.exceptions.TimeoutStateError: If :meth:`start_connect`
+ has not yet been called on this object.
+ """
+ if (self.total is not None and
+ self.total is not self.DEFAULT_TIMEOUT and
+ self._read is not None and
+ self._read is not self.DEFAULT_TIMEOUT):
+ # in case the connect timeout has not yet been established.
+ if self._start_connect is None:
+ return self._read
+ return max(0, min(self.total - self.get_connect_duration(),
+ self._read))
+ elif self.total is not None and self.total is not self.DEFAULT_TIMEOUT:
+ return max(0, self.total - self.get_connect_duration())
+ else:
+ return self._read
diff --git a/PythonHome/Lib/site-packages/requests/packages/urllib3/util/url.py b/PythonHome/Lib/site-packages/requests/packages/urllib3/util/url.py
new file mode 100644
index 000000000..362d21608
--- /dev/null
+++ b/PythonHome/Lib/site-packages/requests/packages/urllib3/util/url.py
@@ -0,0 +1,162 @@
+from collections import namedtuple
+
+from ..exceptions import LocationParseError
+
+
+class Url(namedtuple('Url', ['scheme', 'auth', 'host', 'port', 'path', 'query', 'fragment'])):
+ """
+ Datastructure for representing an HTTP URL. Used as a return value for
+ :func:`parse_url`.
+ """
+ slots = ()
+
+ def __new__(cls, scheme=None, auth=None, host=None, port=None, path=None, query=None, fragment=None):
+ return super(Url, cls).__new__(cls, scheme, auth, host, port, path, query, fragment)
+
+ @property
+ def hostname(self):
+ """For backwards-compatibility with urlparse. We're nice like that."""
+ return self.host
+
+ @property
+ def request_uri(self):
+ """Absolute path including the query string."""
+ uri = self.path or '/'
+
+ if self.query is not None:
+ uri += '?' + self.query
+
+ return uri
+
+ @property
+ def netloc(self):
+ """Network location including host and port"""
+ if self.port:
+ return '%s:%d' % (self.host, self.port)
+ return self.host
+
+
+def split_first(s, delims):
+ """
+ Given a string and an iterable of delimiters, split on the first found
+ delimiter. Return two split parts and the matched delimiter.
+
+ If not found, then the first part is the full input string.
+
+ Example: ::
+
+ >>> split_first('foo/bar?baz', '?/=')
+ ('foo', 'bar?baz', '/')
+ >>> split_first('foo/bar?baz', '123')
+ ('foo/bar?baz', '', None)
+
+ Scales linearly with number of delims. Not ideal for large number of delims.
+ """
+ min_idx = None
+ min_delim = None
+ for d in delims:
+ idx = s.find(d)
+ if idx < 0:
+ continue
+
+ if min_idx is None or idx < min_idx:
+ min_idx = idx
+ min_delim = d
+
+ if min_idx is None or min_idx < 0:
+ return s, '', None
+
+ return s[:min_idx], s[min_idx+1:], min_delim
+
+
+def parse_url(url):
+ """
+ Given a url, return a parsed :class:`.Url` namedtuple. Best-effort is
+ performed to parse incomplete urls. Fields not provided will be None.
+
+ Partly backwards-compatible with :mod:`urlparse`.
+
+ Example: ::
+
+ >>> parse_url('http://google.com/mail/')
+ Url(scheme='http', host='google.com', port=None, path='/', ...)
+ >>> parse_url('google.com:80')
+ Url(scheme=None, host='google.com', port=80, path=None, ...)
+ >>> parse_url('/foo?bar')
+ Url(scheme=None, host=None, port=None, path='/foo', query='bar', ...)
+ """
+
+ # While this code has overlap with stdlib's urlparse, it is much
+ # simplified for our needs and less annoying.
+ # Additionally, this implementations does silly things to be optimal
+ # on CPython.
+
+ scheme = None
+ auth = None
+ host = None
+ port = None
+ path = None
+ fragment = None
+ query = None
+
+ # Scheme
+ if '://' in url:
+ scheme, url = url.split('://', 1)
+
+ # Find the earliest Authority Terminator
+ # (http://tools.ietf.org/html/rfc3986#section-3.2)
+ url, path_, delim = split_first(url, ['/', '?', '#'])
+
+ if delim:
+ # Reassemble the path
+ path = delim + path_
+
+ # Auth
+ if '@' in url:
+ # Last '@' denotes end of auth part
+ auth, url = url.rsplit('@', 1)
+
+ # IPv6
+ if url and url[0] == '[':
+ host, url = url.split(']', 1)
+ host += ']'
+
+ # Port
+ if ':' in url:
+ _host, port = url.split(':', 1)
+
+ if not host:
+ host = _host
+
+ if port:
+ # If given, ports must be integers.
+ if not port.isdigit():
+ raise LocationParseError(url)
+ port = int(port)
+ else:
+ # Blank ports are cool, too. (rfc3986#section-3.2.3)
+ port = None
+
+ elif not host and url:
+ host = url
+
+ if not path:
+ return Url(scheme, auth, host, port, path, query, fragment)
+
+ # Fragment
+ if '#' in path:
+ path, fragment = path.split('#', 1)
+
+ # Query
+ if '?' in path:
+ path, query = path.split('?', 1)
+
+ return Url(scheme, auth, host, port, path, query, fragment)
+
+
+def get_host(url):
+ """
+ Deprecated. Use :func:`.parse_url` instead.
+ """
+ p = parse_url(url)
+ return p.scheme or 'http', p.hostname, p.port
diff --git a/PythonHome/thirdparty/requests/sessions.py b/PythonHome/Lib/site-packages/requests/sessions.py
similarity index 82%
rename from PythonHome/thirdparty/requests/sessions.py
rename to PythonHome/Lib/site-packages/requests/sessions.py
index db227ca37..df85a25c1 100644
--- a/PythonHome/thirdparty/requests/sessions.py
+++ b/PythonHome/Lib/site-packages/requests/sessions.py
@@ -12,27 +12,28 @@ import os
from collections import Mapping
from datetime import datetime
+from .auth import _basic_auth_str
from .compat import cookielib, OrderedDict, urljoin, urlparse, builtin_str
from .cookies import (
cookiejar_from_dict, extract_cookies_to_jar, RequestsCookieJar, merge_cookies)
-from .models import Request, PreparedRequest
+from .models import Request, PreparedRequest, DEFAULT_REDIRECT_LIMIT
from .hooks import default_hooks, dispatch_hook
-from .utils import to_key_val_list, default_headers
-from .exceptions import TooManyRedirects, InvalidSchema
+from .utils import to_key_val_list, default_headers, to_native_string
+from .exceptions import (
+ TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
from .structures import CaseInsensitiveDict
from .adapters import HTTPAdapter
-from .utils import requote_uri, get_environ_proxies, get_netrc_auth
+from .utils import (
+ requote_uri, get_environ_proxies, get_netrc_auth, should_bypass_proxies,
+ get_auth_from_url
+)
from .status_codes import codes
-REDIRECT_STATI = (
- codes.moved, # 301
- codes.found, # 302
- codes.other, # 303
- codes.temporary_moved, # 307
-)
-DEFAULT_REDIRECT_LIMIT = 30
+
+# formerly defined here, reexposed here for backward compatibility
+from .models import REDIRECT_STATI
def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
@@ -63,6 +64,8 @@ def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
if v is None:
del merged_setting[k]
+ merged_setting = dict((k, v) for (k, v) in merged_setting.items() if v is not None)
+
return merged_setting
@@ -89,11 +92,13 @@ class SessionRedirectMixin(object):
i = 0
- # ((resp.status_code is codes.see_other))
- while ('location' in resp.headers and resp.status_code in REDIRECT_STATI):
+ while resp.is_redirect:
prepared_request = req.copy()
- resp.content # Consume socket so it can be released
+ try:
+ resp.content # Consume socket so it can be released
+ except (ChunkedEncodingError, ContentDecodingError, RuntimeError):
+ resp.raw.read(decode_content=False)
if i >= self.max_redirects:
raise TooManyRedirects('Exceeded %s redirects.' % self.max_redirects)
@@ -121,7 +126,7 @@ class SessionRedirectMixin(object):
else:
url = requote_uri(url)
- prepared_request.url = url
+ prepared_request.url = to_native_string(url)
# http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.4
if (resp.status_code == codes.see_other and
@@ -153,13 +158,19 @@ class SessionRedirectMixin(object):
except KeyError:
pass
- extract_cookies_to_jar(prepared_request._cookies,
- prepared_request, resp.raw)
+ extract_cookies_to_jar(prepared_request._cookies, prepared_request, resp.raw)
prepared_request._cookies.update(self.cookies)
prepared_request.prepare_cookies(prepared_request._cookies)
+ # Rebuild auth and proxy information.
+ proxies = self.rebuild_proxies(prepared_request, proxies)
+ self.rebuild_auth(prepared_request, resp)
+
+ # Override the original request.
+ req = prepared_request
+
resp = self.send(
- prepared_request,
+ req,
stream=stream,
timeout=timeout,
verify=verify,
@@ -173,6 +184,68 @@ class SessionRedirectMixin(object):
i += 1
yield resp
+ def rebuild_auth(self, prepared_request, response):
+ """
+ When being redirected we may want to strip authentication from the
+ request to avoid leaking credentials. This method intelligently removes
+ and reapplies authentication where possible to avoid credential loss.
+ """
+ headers = prepared_request.headers
+ url = prepared_request.url
+
+ if 'Authorization' in headers:
+ # If we get redirected to a new host, we should strip out any
+ # authentication headers.
+ original_parsed = urlparse(response.request.url)
+ redirect_parsed = urlparse(url)
+
+ if (original_parsed.hostname != redirect_parsed.hostname):
+ del headers['Authorization']
+
+ # .netrc might have more auth for us on our new host.
+ new_auth = get_netrc_auth(url) if self.trust_env else None
+ if new_auth is not None:
+ prepared_request.prepare_auth(new_auth)
+
+ return
+
+ def rebuild_proxies(self, prepared_request, proxies):
+ """
+ This method re-evaluates the proxy configuration by considering the
+ environment variables. If we are redirected to a URL covered by
+ NO_PROXY, we strip the proxy configuration. Otherwise, we set missing
+ proxy keys for this URL (in case they were stripped by a previous
+ redirect).
+
+ This method also replaces the Proxy-Authorization header where
+ necessary.
+ """
+ headers = prepared_request.headers
+ url = prepared_request.url
+ scheme = urlparse(url).scheme
+ new_proxies = proxies.copy() if proxies is not None else {}
+
+ if self.trust_env and not should_bypass_proxies(url):
+ environ_proxies = get_environ_proxies(url)
+
+ proxy = environ_proxies.get(scheme)
+
+ if proxy:
+ new_proxies.setdefault(scheme, environ_proxies[scheme])
+
+ if 'Proxy-Authorization' in headers:
+ del headers['Proxy-Authorization']
+
+ try:
+ username, password = get_auth_from_url(new_proxies[scheme])
+ except KeyError:
+ username, password = None, None
+
+ if username and password:
+ headers['Proxy-Authorization'] = _basic_auth_str(username, password)
+
+ return new_proxies
+
class Session(SessionRedirectMixin):
"""A Requests session.
@@ -320,7 +393,7 @@ class Session(SessionRedirectMixin):
:param auth: (optional) Auth tuple or callable to enable
Basic/Digest/Custom HTTP Auth.
:param timeout: (optional) Float describing the timeout of the
- request.
+ request in seconds.
:param allow_redirects: (optional) Boolean. Set to True by default.
:param proxies: (optional) Dictionary mapping protocol to the URL of
the proxy.
@@ -467,8 +540,7 @@ class Session(SessionRedirectMixin):
if not isinstance(request, PreparedRequest):
raise ValueError('You can only send PreparedRequests.')
- # Set up variables needed for resolve_redirects and dispatching of
- # hooks
+ # Set up variables needed for resolve_redirects and dispatching of hooks
allow_redirects = kwargs.pop('allow_redirects', True)
stream = kwargs.get('stream')
timeout = kwargs.get('timeout')
@@ -482,8 +554,10 @@ class Session(SessionRedirectMixin):
# Start time (approximately) of the request
start = datetime.utcnow()
+
# Send the request
r = adapter.send(request, **kwargs)
+
# Total elapsed time of the request (approximately)
r.elapsed = datetime.utcnow() - start
@@ -492,15 +566,20 @@ class Session(SessionRedirectMixin):
# Persist cookies
if r.history:
+
# If the hooks create history then we want those cookies too
for resp in r.history:
extract_cookies_to_jar(self.cookies, resp.request, resp.raw)
+
extract_cookies_to_jar(self.cookies, request, r.raw)
# Redirect resolving generator.
- gen = self.resolve_redirects(r, request, stream=stream,
- timeout=timeout, verify=verify, cert=cert,
- proxies=proxies)
+ gen = self.resolve_redirects(r, request,
+ stream=stream,
+ timeout=timeout,
+ verify=verify,
+ cert=cert,
+ proxies=proxies)
# Resolve redirects if allowed.
history = [resp for resp in gen] if allow_redirects else []
@@ -511,7 +590,10 @@ class Session(SessionRedirectMixin):
history.insert(0, r)
# Get the last request made
r = history.pop()
- r.history = tuple(history)
+ r.history = history
+
+ if not stream:
+ r.content
return r
@@ -534,8 +616,10 @@ class Session(SessionRedirectMixin):
"""Registers a connection adapter to a prefix.
Adapters are sorted in descending order by key length."""
+
self.adapters[prefix] = adapter
keys_to_move = [k for k in self.adapters if len(k) < len(prefix)]
+
for key in keys_to_move:
self.adapters[key] = self.adapters.pop(key)
diff --git a/PythonHome/thirdparty/requests/status_codes.py b/PythonHome/Lib/site-packages/requests/status_codes.py
similarity index 100%
rename from PythonHome/thirdparty/requests/status_codes.py
rename to PythonHome/Lib/site-packages/requests/status_codes.py
diff --git a/PythonHome/thirdparty/requests/structures.py b/PythonHome/Lib/site-packages/requests/structures.py
similarity index 97%
rename from PythonHome/thirdparty/requests/structures.py
rename to PythonHome/Lib/site-packages/requests/structures.py
index a1759137a..9fd78187f 100644
--- a/PythonHome/thirdparty/requests/structures.py
+++ b/PythonHome/Lib/site-packages/requests/structures.py
@@ -106,8 +106,7 @@ class CaseInsensitiveDict(collections.MutableMapping):
return CaseInsensitiveDict(self._store.values())
def __repr__(self):
- return '%s(%r)' % (self.__class__.__name__, dict(self.items()))
-
+ return str(dict(self.items()))
class LookupDict(dict):
"""Dictionary lookup object."""
diff --git a/PythonHome/thirdparty/requests/utils.py b/PythonHome/Lib/site-packages/requests/utils.py
similarity index 94%
rename from PythonHome/thirdparty/requests/utils.py
rename to PythonHome/Lib/site-packages/requests/utils.py
index 7b7ff0a7b..68e50cf0a 100644
--- a/PythonHome/thirdparty/requests/utils.py
+++ b/PythonHome/Lib/site-packages/requests/utils.py
@@ -24,10 +24,10 @@ from . import __version__
from . import certs
from .compat import parse_http_list as _parse_list_header
from .compat import (quote, urlparse, bytes, str, OrderedDict, unquote, is_py2,
- builtin_str, getproxies, proxy_bypass)
+ builtin_str, getproxies, proxy_bypass, urlunparse)
from .cookies import RequestsCookieJar, cookiejar_from_dict
from .structures import CaseInsensitiveDict
-from .exceptions import MissingSchema, InvalidURL
+from .exceptions import InvalidURL
_hush_pyflakes = (RequestsCookieJar,)
@@ -61,7 +61,7 @@ def super_len(o):
return os.fstat(fileno).st_size
if hasattr(o, 'getvalue'):
- # e.g. BytesIO, cStringIO.StringI
+ # e.g. BytesIO, cStringIO.StringIO
return len(o.getvalue())
@@ -466,9 +466,10 @@ def is_valid_cidr(string_network):
return True
-def get_environ_proxies(url):
- """Return a dict of environment proxies."""
-
+def should_bypass_proxies(url):
+ """
+ Returns whether we should bypass proxies or not.
+ """
get_proxy = lambda k: os.environ.get(k) or os.environ.get(k.upper())
# First check whether no_proxy is defined. If it is, check that the URL
@@ -486,13 +487,13 @@ def get_environ_proxies(url):
for proxy_ip in no_proxy:
if is_valid_cidr(proxy_ip):
if address_in_network(ip, proxy_ip):
- return {}
+ return True
else:
for host in no_proxy:
if netloc.endswith(host) or netloc.split(':')[0].endswith(host):
# The URL does match something in no_proxy, so we don't want
# to apply the proxies on this URL.
- return {}
+ return True
# If the system proxy settings indicate that this URL should be bypassed,
# don't proxy.
@@ -506,12 +507,16 @@ def get_environ_proxies(url):
bypass = False
if bypass:
- return {}
+ return True
- # If we get here, we either didn't have no_proxy set or we're not going
- # anywhere that no_proxy applies to, and the system settings don't require
- # bypassing the proxy for the current URL.
- return getproxies()
+ return False
+
+def get_environ_proxies(url):
+ """Return a dict of environment proxies."""
+ if should_bypass_proxies(url):
+ return {}
+ else:
+ return getproxies()
def default_user_agent(name="python-requests"):
@@ -548,7 +553,7 @@ def default_user_agent(name="python-requests"):
def default_headers():
return CaseInsensitiveDict({
'User-Agent': default_user_agent(),
- 'Accept-Encoding': ', '.join(('gzip', 'deflate', 'compress')),
+ 'Accept-Encoding': ', '.join(('gzip', 'deflate')),
'Accept': '*/*'
})
@@ -622,13 +627,18 @@ def guess_json_utf(data):
return None
-def except_on_missing_scheme(url):
- """Given a URL, raise a MissingSchema exception if the scheme is missing.
- """
- scheme, netloc, path, params, query, fragment = urlparse(url)
+def prepend_scheme_if_needed(url, new_scheme):
+ '''Given a URL that may or may not have a scheme, prepend the given scheme.
+ Does not replace a present scheme with the one provided as an argument.'''
+ scheme, netloc, path, params, query, fragment = urlparse(url, new_scheme)
- if not scheme:
- raise MissingSchema('Proxy URLs must have explicit schemes.')
+ # urlparse is a finicky beast, and sometimes decides that there isn't a
+ # netloc present. Assume that it's being over-cautious, and switch netloc
+ # and path if urlparse decided there was no netloc.
+ if not netloc:
+ netloc, path = path, netloc
+
+ return urlunparse((scheme, netloc, path, params, query, fragment))
def get_auth_from_url(url):
diff --git a/PythonHome/thirdparty/setuptools-5.4.1.dist-info/DESCRIPTION.rst b/PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/DESCRIPTION.rst
similarity index 100%
rename from PythonHome/thirdparty/setuptools-5.4.1.dist-info/DESCRIPTION.rst
rename to PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/DESCRIPTION.rst
diff --git a/PythonHome/thirdparty/setuptools-5.4.1.dist-info/METADATA b/PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/METADATA
similarity index 100%
rename from PythonHome/thirdparty/setuptools-5.4.1.dist-info/METADATA
rename to PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/METADATA
diff --git a/PythonHome/thirdparty/setuptools-5.4.1.dist-info/RECORD b/PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/RECORD
similarity index 97%
rename from PythonHome/thirdparty/setuptools-5.4.1.dist-info/RECORD
rename to PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/RECORD
index 2cc947a96..4465aaeec 100644
--- a/PythonHome/thirdparty/setuptools-5.4.1.dist-info/RECORD
+++ b/PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/RECORD
@@ -83,8 +83,8 @@ setuptools-5.4.1.dist-info/WHEEL,sha256=2QrAqABq1X2mxKM4JY32oZUIM268GesCrPKhzE9R
setuptools-5.4.1.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
_markerlib/markers.py,sha256=YuFp0-osufFIoqnzG3L0Z2fDCx4Vln3VUDeXJ2DA_1I,3979
_markerlib/__init__.py,sha256=GSmhZqvAitLJHhSgtqqusfq2nJ_ClP3oy3Lm0uZLIsU,552
-e:\github\Wox.JSONRPC\Output\Debug\PythonHome\Scripts\easy_install.exe,sha256=ktvdzicYaXuV9Ps9MmxEZLOo22vx0rRo92IcaGuoOZ8,91530
-e:\github\Wox.JSONRPC\Output\Debug\PythonHome\Scripts\easy_install-2.7.exe,sha256=ktvdzicYaXuV9Ps9MmxEZLOo22vx0rRo92IcaGuoOZ8,91530
+Scripts\easy_install.exe,sha256=j3-cCoCIjUJ_6JofGmdXS0F_g2XnwGbirCTXjSvQCjI,91509
+Scripts\easy_install-2.7.exe,sha256=j3-cCoCIjUJ_6JofGmdXS0F_g2XnwGbirCTXjSvQCjI,91509
setuptools/tests/test_upload_docs.pyc,,
setuptools/ssl_support.pyc,,
setuptools/dist.pyc,,
diff --git a/PythonHome/thirdparty/setuptools-5.4.1.dist-info/WHEEL b/PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/WHEEL
similarity index 100%
rename from PythonHome/thirdparty/setuptools-5.4.1.dist-info/WHEEL
rename to PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/WHEEL
diff --git a/PythonHome/thirdparty/setuptools-5.4.1.dist-info/dependency_links.txt b/PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/dependency_links.txt
similarity index 100%
rename from PythonHome/thirdparty/setuptools-5.4.1.dist-info/dependency_links.txt
rename to PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/dependency_links.txt
diff --git a/PythonHome/thirdparty/setuptools-5.4.1.dist-info/entry_points.txt b/PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/entry_points.txt
similarity index 100%
rename from PythonHome/thirdparty/setuptools-5.4.1.dist-info/entry_points.txt
rename to PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/entry_points.txt
diff --git a/PythonHome/thirdparty/setuptools-5.4.1.dist-info/pydist.json b/PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/pydist.json
similarity index 100%
rename from PythonHome/thirdparty/setuptools-5.4.1.dist-info/pydist.json
rename to PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/pydist.json
diff --git a/PythonHome/thirdparty/setuptools-5.4.1.dist-info/top_level.txt b/PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/top_level.txt
similarity index 100%
rename from PythonHome/thirdparty/setuptools-5.4.1.dist-info/top_level.txt
rename to PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/top_level.txt
diff --git a/PythonHome/thirdparty/setuptools-5.4.1.dist-info/zip-safe b/PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/zip-safe
similarity index 100%
rename from PythonHome/thirdparty/setuptools-5.4.1.dist-info/zip-safe
rename to PythonHome/Lib/site-packages/setuptools-5.4.1.dist-info/zip-safe
diff --git a/PythonHome/thirdparty/setuptools/__init__.py b/PythonHome/Lib/site-packages/setuptools/__init__.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/__init__.py
rename to PythonHome/Lib/site-packages/setuptools/__init__.py
diff --git a/PythonHome/thirdparty/setuptools/archive_util.py b/PythonHome/Lib/site-packages/setuptools/archive_util.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/archive_util.py
rename to PythonHome/Lib/site-packages/setuptools/archive_util.py
diff --git a/PythonHome/thirdparty/setuptools/command/__init__.py b/PythonHome/Lib/site-packages/setuptools/command/__init__.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/__init__.py
rename to PythonHome/Lib/site-packages/setuptools/command/__init__.py
diff --git a/PythonHome/thirdparty/setuptools/command/alias.py b/PythonHome/Lib/site-packages/setuptools/command/alias.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/alias.py
rename to PythonHome/Lib/site-packages/setuptools/command/alias.py
diff --git a/PythonHome/thirdparty/setuptools/command/bdist_egg.py b/PythonHome/Lib/site-packages/setuptools/command/bdist_egg.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/bdist_egg.py
rename to PythonHome/Lib/site-packages/setuptools/command/bdist_egg.py
diff --git a/PythonHome/thirdparty/setuptools/command/bdist_rpm.py b/PythonHome/Lib/site-packages/setuptools/command/bdist_rpm.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/bdist_rpm.py
rename to PythonHome/Lib/site-packages/setuptools/command/bdist_rpm.py
diff --git a/PythonHome/thirdparty/setuptools/command/bdist_wininst.py b/PythonHome/Lib/site-packages/setuptools/command/bdist_wininst.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/bdist_wininst.py
rename to PythonHome/Lib/site-packages/setuptools/command/bdist_wininst.py
diff --git a/PythonHome/thirdparty/setuptools/command/build_ext.py b/PythonHome/Lib/site-packages/setuptools/command/build_ext.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/build_ext.py
rename to PythonHome/Lib/site-packages/setuptools/command/build_ext.py
diff --git a/PythonHome/thirdparty/setuptools/command/build_py.py b/PythonHome/Lib/site-packages/setuptools/command/build_py.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/build_py.py
rename to PythonHome/Lib/site-packages/setuptools/command/build_py.py
diff --git a/PythonHome/thirdparty/setuptools/command/develop.py b/PythonHome/Lib/site-packages/setuptools/command/develop.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/develop.py
rename to PythonHome/Lib/site-packages/setuptools/command/develop.py
diff --git a/PythonHome/thirdparty/setuptools/command/easy_install.py b/PythonHome/Lib/site-packages/setuptools/command/easy_install.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/easy_install.py
rename to PythonHome/Lib/site-packages/setuptools/command/easy_install.py
diff --git a/PythonHome/thirdparty/setuptools/command/egg_info.py b/PythonHome/Lib/site-packages/setuptools/command/egg_info.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/egg_info.py
rename to PythonHome/Lib/site-packages/setuptools/command/egg_info.py
diff --git a/PythonHome/thirdparty/setuptools/command/install.py b/PythonHome/Lib/site-packages/setuptools/command/install.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/install.py
rename to PythonHome/Lib/site-packages/setuptools/command/install.py
diff --git a/PythonHome/thirdparty/setuptools/command/install_egg_info.py b/PythonHome/Lib/site-packages/setuptools/command/install_egg_info.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/install_egg_info.py
rename to PythonHome/Lib/site-packages/setuptools/command/install_egg_info.py
diff --git a/PythonHome/thirdparty/setuptools/command/install_lib.py b/PythonHome/Lib/site-packages/setuptools/command/install_lib.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/install_lib.py
rename to PythonHome/Lib/site-packages/setuptools/command/install_lib.py
diff --git a/PythonHome/thirdparty/setuptools/command/install_scripts.py b/PythonHome/Lib/site-packages/setuptools/command/install_scripts.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/install_scripts.py
rename to PythonHome/Lib/site-packages/setuptools/command/install_scripts.py
diff --git a/PythonHome/thirdparty/setuptools/command/register.py b/PythonHome/Lib/site-packages/setuptools/command/register.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/register.py
rename to PythonHome/Lib/site-packages/setuptools/command/register.py
diff --git a/PythonHome/thirdparty/setuptools/command/rotate.py b/PythonHome/Lib/site-packages/setuptools/command/rotate.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/rotate.py
rename to PythonHome/Lib/site-packages/setuptools/command/rotate.py
diff --git a/PythonHome/thirdparty/setuptools/command/saveopts.py b/PythonHome/Lib/site-packages/setuptools/command/saveopts.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/saveopts.py
rename to PythonHome/Lib/site-packages/setuptools/command/saveopts.py
diff --git a/PythonHome/thirdparty/setuptools/command/sdist.py b/PythonHome/Lib/site-packages/setuptools/command/sdist.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/sdist.py
rename to PythonHome/Lib/site-packages/setuptools/command/sdist.py
diff --git a/PythonHome/thirdparty/setuptools/command/setopt.py b/PythonHome/Lib/site-packages/setuptools/command/setopt.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/setopt.py
rename to PythonHome/Lib/site-packages/setuptools/command/setopt.py
diff --git a/PythonHome/thirdparty/setuptools/command/test.py b/PythonHome/Lib/site-packages/setuptools/command/test.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/test.py
rename to PythonHome/Lib/site-packages/setuptools/command/test.py
diff --git a/PythonHome/thirdparty/setuptools/command/upload_docs.py b/PythonHome/Lib/site-packages/setuptools/command/upload_docs.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/command/upload_docs.py
rename to PythonHome/Lib/site-packages/setuptools/command/upload_docs.py
diff --git a/PythonHome/thirdparty/setuptools/compat.py b/PythonHome/Lib/site-packages/setuptools/compat.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/compat.py
rename to PythonHome/Lib/site-packages/setuptools/compat.py
diff --git a/PythonHome/thirdparty/setuptools/depends.py b/PythonHome/Lib/site-packages/setuptools/depends.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/depends.py
rename to PythonHome/Lib/site-packages/setuptools/depends.py
diff --git a/PythonHome/thirdparty/setuptools/dist.py b/PythonHome/Lib/site-packages/setuptools/dist.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/dist.py
rename to PythonHome/Lib/site-packages/setuptools/dist.py
diff --git a/PythonHome/thirdparty/setuptools/extension.py b/PythonHome/Lib/site-packages/setuptools/extension.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/extension.py
rename to PythonHome/Lib/site-packages/setuptools/extension.py
diff --git a/PythonHome/thirdparty/setuptools/lib2to3_ex.py b/PythonHome/Lib/site-packages/setuptools/lib2to3_ex.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/lib2to3_ex.py
rename to PythonHome/Lib/site-packages/setuptools/lib2to3_ex.py
diff --git a/PythonHome/thirdparty/setuptools/package_index.py b/PythonHome/Lib/site-packages/setuptools/package_index.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/package_index.py
rename to PythonHome/Lib/site-packages/setuptools/package_index.py
diff --git a/PythonHome/thirdparty/setuptools/py26compat.py b/PythonHome/Lib/site-packages/setuptools/py26compat.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/py26compat.py
rename to PythonHome/Lib/site-packages/setuptools/py26compat.py
diff --git a/PythonHome/thirdparty/setuptools/py27compat.py b/PythonHome/Lib/site-packages/setuptools/py27compat.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/py27compat.py
rename to PythonHome/Lib/site-packages/setuptools/py27compat.py
diff --git a/PythonHome/thirdparty/setuptools/py31compat.py b/PythonHome/Lib/site-packages/setuptools/py31compat.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/py31compat.py
rename to PythonHome/Lib/site-packages/setuptools/py31compat.py
diff --git a/PythonHome/thirdparty/setuptools/sandbox.py b/PythonHome/Lib/site-packages/setuptools/sandbox.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/sandbox.py
rename to PythonHome/Lib/site-packages/setuptools/sandbox.py
diff --git a/PythonHome/thirdparty/setuptools/script (dev).tmpl b/PythonHome/Lib/site-packages/setuptools/script (dev).tmpl
similarity index 100%
rename from PythonHome/thirdparty/setuptools/script (dev).tmpl
rename to PythonHome/Lib/site-packages/setuptools/script (dev).tmpl
diff --git a/PythonHome/thirdparty/setuptools/script.tmpl b/PythonHome/Lib/site-packages/setuptools/script.tmpl
similarity index 100%
rename from PythonHome/thirdparty/setuptools/script.tmpl
rename to PythonHome/Lib/site-packages/setuptools/script.tmpl
diff --git a/PythonHome/thirdparty/setuptools/site-patch.py b/PythonHome/Lib/site-packages/setuptools/site-patch.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/site-patch.py
rename to PythonHome/Lib/site-packages/setuptools/site-patch.py
diff --git a/PythonHome/thirdparty/setuptools/ssl_support.py b/PythonHome/Lib/site-packages/setuptools/ssl_support.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/ssl_support.py
rename to PythonHome/Lib/site-packages/setuptools/ssl_support.py
diff --git a/PythonHome/thirdparty/setuptools/svn_utils.py b/PythonHome/Lib/site-packages/setuptools/svn_utils.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/svn_utils.py
rename to PythonHome/Lib/site-packages/setuptools/svn_utils.py
diff --git a/PythonHome/thirdparty/setuptools/unicode_utils.py b/PythonHome/Lib/site-packages/setuptools/unicode_utils.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/unicode_utils.py
rename to PythonHome/Lib/site-packages/setuptools/unicode_utils.py
diff --git a/PythonHome/thirdparty/setuptools/version.py b/PythonHome/Lib/site-packages/setuptools/version.py
similarity index 100%
rename from PythonHome/thirdparty/setuptools/version.py
rename to PythonHome/Lib/site-packages/setuptools/version.py
diff --git a/PythonHome/Lib/site-packages/site.py b/PythonHome/Lib/site-packages/site.py
new file mode 100644
index 000000000..c2168019a
--- /dev/null
+++ b/PythonHome/Lib/site-packages/site.py
@@ -0,0 +1,76 @@
+def __boot():
+ import sys
+ import os
+ PYTHONPATH = os.environ.get('PYTHONPATH')
+ if PYTHONPATH is None or (sys.platform=='win32' and not PYTHONPATH):
+ PYTHONPATH = []
+ else:
+ PYTHONPATH = PYTHONPATH.split(os.pathsep)
+
+ pic = getattr(sys,'path_importer_cache',{})
+ stdpath = sys.path[len(PYTHONPATH):]
+ mydir = os.path.dirname(__file__)
+ #print "searching",stdpath,sys.path
+
+ for item in stdpath:
+ if item==mydir or not item:
+ continue # skip if current dir. on Windows, or my own directory
+ importer = pic.get(item)
+ if importer is not None:
+ loader = importer.find_module('site')
+ if loader is not None:
+ # This should actually reload the current module
+ loader.load_module('site')
+ break
+ else:
+ try:
+ import imp # Avoid import loop in Python >= 3.3
+ stream, path, descr = imp.find_module('site',[item])
+ except ImportError:
+ continue
+ if stream is None:
+ continue
+ try:
+ # This should actually reload the current module
+ imp.load_module('site',stream,path,descr)
+ finally:
+ stream.close()
+ break
+ else:
+ raise ImportError("Couldn't find the real 'site' module")
+
+ #print "loaded", __file__
+
+ known_paths = dict([(makepath(item)[1],1) for item in sys.path]) # 2.2 comp
+
+ oldpos = getattr(sys,'__egginsert',0) # save old insertion position
+ sys.__egginsert = 0 # and reset the current one
+
+ for item in PYTHONPATH:
+ addsitedir(item)
+
+ sys.__egginsert += oldpos # restore effective old position
+
+ d, nd = makepath(stdpath[0])
+ insert_at = None
+ new_path = []
+
+ for item in sys.path:
+ p, np = makepath(item)
+
+ if np==nd and insert_at is None:
+ # We've hit the first 'system' path entry, so added entries go here
+ insert_at = len(new_path)
+
+ if np in known_paths or insert_at is None:
+ new_path.append(item)
+ else:
+ # new path after the insert point, back-insert it
+ new_path.insert(insert_at, item)
+ insert_at += 1
+
+ sys.path[:] = new_path
+
+if __name__=='site':
+ __boot()
+ del __boot
diff --git a/PythonHome/Scripts/easy_install-2.7.exe b/PythonHome/Scripts/easy_install-2.7.exe
index 3d908b457..26964ed1f 100644
Binary files a/PythonHome/Scripts/easy_install-2.7.exe and b/PythonHome/Scripts/easy_install-2.7.exe differ
diff --git a/PythonHome/Scripts/easy_install.exe b/PythonHome/Scripts/easy_install.exe
index 3d908b457..26964ed1f 100644
Binary files a/PythonHome/Scripts/easy_install.exe and b/PythonHome/Scripts/easy_install.exe differ
diff --git a/PythonHome/Scripts/pip.exe b/PythonHome/Scripts/pip.exe
index 896036670..f1a788bc4 100644
Binary files a/PythonHome/Scripts/pip.exe and b/PythonHome/Scripts/pip.exe differ
diff --git a/PythonHome/Scripts/pip2.7.exe b/PythonHome/Scripts/pip2.7.exe
index 896036670..f1a788bc4 100644
Binary files a/PythonHome/Scripts/pip2.7.exe and b/PythonHome/Scripts/pip2.7.exe differ
diff --git a/PythonHome/Scripts/pip2.exe b/PythonHome/Scripts/pip2.exe
index 896036670..f1a788bc4 100644
Binary files a/PythonHome/Scripts/pip2.exe and b/PythonHome/Scripts/pip2.exe differ
diff --git a/PythonHome/pythonx.bat b/PythonHome/pythonx.bat
index ab0d2f4d7..15c1a2eb7 100644
--- a/PythonHome/pythonx.bat
+++ b/PythonHome/pythonx.bat
@@ -1,2 +1,2 @@
-set PYTHONPATH=DLLs;thirdparty
+set PYTHONPATH=DLLs;Lib\site-packages
python.exe -B %*
diff --git a/PythonHome/thirdparty/README.txt b/PythonHome/thirdparty/README.txt
deleted file mode 100644
index 273f6251a..000000000
--- a/PythonHome/thirdparty/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory exists so that 3rd party packages can be installed
-here. Read the source for site.py for more details.
diff --git a/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/PKG-INFO b/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/PKG-INFO
deleted file mode 100644
index c9fbab8f8..000000000
--- a/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/PKG-INFO
+++ /dev/null
@@ -1,20 +0,0 @@
-Metadata-Version: 1.1
-Name: beautifulsoup4
-Version: 4.3.2
-Summary: UNKNOWN
-Home-page: http://www.crummy.com/software/BeautifulSoup/bs4/
-Author: Leonard Richardson
-Author-email: leonardr@segfault.org
-License: MIT
-Download-URL: http://www.crummy.com/software/BeautifulSoup/bs4/download/
-Description: Beautiful Soup sits atop an HTML or XML parser, providing Pythonic idioms for iterating, searching, and modifying the parse tree.
-Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Text Processing :: Markup :: HTML
-Classifier: Topic :: Text Processing :: Markup :: XML
-Classifier: Topic :: Text Processing :: Markup :: SGML
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
diff --git a/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/SOURCES.txt b/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/SOURCES.txt
deleted file mode 100644
index d5fbda3bf..000000000
--- a/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-README.txt
-beautifulsoup4.egg-info/PKG-INFO
-beautifulsoup4.egg-info/SOURCES.txt
-beautifulsoup4.egg-info/dependency_links.txt
-beautifulsoup4.egg-info/top_level.txt
-bs4/__init__.py
-bs4/dammit.py
-bs4/diagnose.py
-bs4/element.py
-bs4/testing.py
-bs4/builder/__init__.py
-bs4/builder/_html5lib.py
-bs4/builder/_htmlparser.py
-bs4/builder/_lxml.py
-bs4/tests/__init__.py
-bs4/tests/test_builder_registry.py
-bs4/tests/test_docs.py
-bs4/tests/test_html5lib.py
-bs4/tests/test_htmlparser.py
-bs4/tests/test_lxml.py
-bs4/tests/test_soup.py
-bs4/tests/test_tree.py
\ No newline at end of file
diff --git a/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/dependency_links.txt b/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/dependency_links.txt
deleted file mode 100644
index 8b1378917..000000000
--- a/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/installed-files.txt b/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/installed-files.txt
deleted file mode 100644
index 1c4d344b9..000000000
--- a/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/installed-files.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-..\bs4\dammit.py
-..\bs4\diagnose.py
-..\bs4\element.py
-..\bs4\testing.py
-..\bs4\__init__.py
-..\bs4\builder\_html5lib.py
-..\bs4\builder\_htmlparser.py
-..\bs4\builder\_lxml.py
-..\bs4\builder\__init__.py
-..\bs4\tests\test_builder_registry.py
-..\bs4\tests\test_docs.py
-..\bs4\tests\test_html5lib.py
-..\bs4\tests\test_htmlparser.py
-..\bs4\tests\test_lxml.py
-..\bs4\tests\test_soup.py
-..\bs4\tests\test_tree.py
-..\bs4\tests\__init__.py
-..\bs4\dammit.pyc
-..\bs4\diagnose.pyc
-..\bs4\element.pyc
-..\bs4\testing.pyc
-..\bs4\__init__.pyc
-..\bs4\builder\_html5lib.pyc
-..\bs4\builder\_htmlparser.pyc
-..\bs4\builder\_lxml.pyc
-..\bs4\builder\__init__.pyc
-..\bs4\tests\test_builder_registry.pyc
-..\bs4\tests\test_docs.pyc
-..\bs4\tests\test_html5lib.pyc
-..\bs4\tests\test_htmlparser.pyc
-..\bs4\tests\test_lxml.pyc
-..\bs4\tests\test_soup.pyc
-..\bs4\tests\test_tree.pyc
-..\bs4\tests\__init__.pyc
-.\
-dependency_links.txt
-PKG-INFO
-SOURCES.txt
-top_level.txt
diff --git a/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/top_level.txt b/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/top_level.txt
deleted file mode 100644
index 13154420d..000000000
--- a/PythonHome/thirdparty/beautifulsoup4-4.3.2-py2.7.egg-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-bs4
diff --git a/PythonHome/thirdparty/bs4/__init__.py b/PythonHome/thirdparty/bs4/__init__.py
deleted file mode 100644
index 7ba34269a..000000000
--- a/PythonHome/thirdparty/bs4/__init__.py
+++ /dev/null
@@ -1,406 +0,0 @@
-"""Beautiful Soup
-Elixir and Tonic
-"The Screen-Scraper's Friend"
-http://www.crummy.com/software/BeautifulSoup/
-
-Beautiful Soup uses a pluggable XML or HTML parser to parse a
-(possibly invalid) document into a tree representation. Beautiful Soup
-provides provides methods and Pythonic idioms that make it easy to
-navigate, search, and modify the parse tree.
-
-Beautiful Soup works with Python 2.6 and up. It works better if lxml
-and/or html5lib is installed.
-
-For more than you ever wanted to know about Beautiful Soup, see the
-documentation:
-http://www.crummy.com/software/BeautifulSoup/bs4/doc/
-"""
-
-__author__ = "Leonard Richardson (leonardr@segfault.org)"
-__version__ = "4.3.2"
-__copyright__ = "Copyright (c) 2004-2013 Leonard Richardson"
-__license__ = "MIT"
-
-__all__ = ['BeautifulSoup']
-
-import os
-import re
-import warnings
-
-from .builder import builder_registry, ParserRejectedMarkup
-from .dammit import UnicodeDammit
-from .element import (
- CData,
- Comment,
- DEFAULT_OUTPUT_ENCODING,
- Declaration,
- Doctype,
- NavigableString,
- PageElement,
- ProcessingInstruction,
- ResultSet,
- SoupStrainer,
- Tag,
- )
-
-# The very first thing we do is give a useful error if someone is
-# running this code under Python 3 without converting it.
-syntax_error = u'You are trying to run the Python 2 version of Beautiful Soup under Python 3. This will not work. You need to convert the code, either by installing it (`python setup.py install`) or by running 2to3 (`2to3 -w bs4`).'
-
-class BeautifulSoup(Tag):
- """
- This class defines the basic interface called by the tree builders.
-
- These methods will be called by the parser:
- reset()
- feed(markup)
-
- The tree builder may call these methods from its feed() implementation:
- handle_starttag(name, attrs) # See note about return value
- handle_endtag(name)
- handle_data(data) # Appends to the current data node
- endData(containerClass=NavigableString) # Ends the current data node
-
- No matter how complicated the underlying parser is, you should be
- able to build a tree using 'start tag' events, 'end tag' events,
- 'data' events, and "done with data" events.
-
- If you encounter an empty-element tag (aka a self-closing tag,
- like HTML's tag to be
- an empty-element tag (it's not in
- HTMLBuilder.empty_element_tags). This means an empty
tag
- will be presented as "
", not "
".
-
- The default implementation has no opinion about which tags are
- empty-element tags, so a tag will be presented as an
- empty-element tag if and only if it has no contents.
- "bar " will
- be left alone.
- """
- if self.empty_element_tags is None:
- return True
- return tag_name in self.empty_element_tags
-
- def feed(self, markup):
- raise NotImplementedError()
-
- def prepare_markup(self, markup, user_specified_encoding=None,
- document_declared_encoding=None):
- return markup, None, None, False
-
- def test_fragment_to_document(self, fragment):
- """Wrap an HTML fragment to make it look like a document.
-
- Different parsers do this differently. For instance, lxml
- introduces an empty tag, and html5lib
- doesn't. Abstracting this away lets us write simple tests
- which run HTML fragments through the parser and compare the
- results against other HTML fragments.
-
- This method should not be used outside of tests.
- """
- return fragment
-
- def set_up_substitutions(self, tag):
- return False
-
- def _replace_cdata_list_attribute_values(self, tag_name, attrs):
- """Replaces class="foo bar" with class=["foo", "bar"]
-
- Modifies its input in place.
- """
- if not attrs:
- return attrs
- if self.cdata_list_attributes:
- universal = self.cdata_list_attributes.get('*', [])
- tag_specific = self.cdata_list_attributes.get(
- tag_name.lower(), None)
- for attr in attrs.keys():
- if attr in universal or (tag_specific and attr in tag_specific):
- # We have a "class"-type attribute whose string
- # value is a whitespace-separated list of
- # values. Split it into a list.
- value = attrs[attr]
- if isinstance(value, basestring):
- values = whitespace_re.split(value)
- else:
- # html5lib sometimes calls setAttributes twice
- # for the same tag when rearranging the parse
- # tree. On the second call the attribute value
- # here is already a list. If this happens,
- # leave the value alone rather than trying to
- # split it again.
- values = value
- attrs[attr] = values
- return attrs
-
-class SAXTreeBuilder(TreeBuilder):
- """A Beautiful Soup treebuilder that listens for SAX events."""
-
- def feed(self, markup):
- raise NotImplementedError()
-
- def close(self):
- pass
-
- def startElement(self, name, attrs):
- attrs = dict((key[1], value) for key, value in list(attrs.items()))
- #print "Start %s, %r" % (name, attrs)
- self.soup.handle_starttag(name, attrs)
-
- def endElement(self, name):
- #print "End %s" % name
- self.soup.handle_endtag(name)
-
- def startElementNS(self, nsTuple, nodeName, attrs):
- # Throw away (ns, nodeName) for now.
- self.startElement(nodeName, attrs)
-
- def endElementNS(self, nsTuple, nodeName):
- # Throw away (ns, nodeName) for now.
- self.endElement(nodeName)
- #handler.endElementNS((ns, node.nodeName), node.nodeName)
-
- def startPrefixMapping(self, prefix, nodeValue):
- # Ignore the prefix for now.
- pass
-
- def endPrefixMapping(self, prefix):
- # Ignore the prefix for now.
- # handler.endPrefixMapping(prefix)
- pass
-
- def characters(self, content):
- self.soup.handle_data(content)
-
- def startDocument(self):
- pass
-
- def endDocument(self):
- pass
-
-
-class HTMLTreeBuilder(TreeBuilder):
- """This TreeBuilder knows facts about HTML.
-
- Such as which tags are empty-element tags.
- """
-
- preserve_whitespace_tags = set(['pre', 'textarea'])
- empty_element_tags = set(['br' , 'hr', 'input', 'img', 'meta',
- 'spacer', 'link', 'frame', 'base'])
-
- # The HTML standard defines these attributes as containing a
- # space-separated list of values, not a single value. That is,
- # class="foo bar" means that the 'class' attribute has two values,
- # 'foo' and 'bar', not the single value 'foo bar'. When we
- # encounter one of these attributes, we will parse its value into
- # a list of values if possible. Upon output, the list will be
- # converted back into a string.
- cdata_list_attributes = {
- "*" : ['class', 'accesskey', 'dropzone'],
- "a" : ['rel', 'rev'],
- "link" : ['rel', 'rev'],
- "td" : ["headers"],
- "th" : ["headers"],
- "td" : ["headers"],
- "form" : ["accept-charset"],
- "object" : ["archive"],
-
- # These are HTML5 specific, as are *.accesskey and *.dropzone above.
- "area" : ["rel"],
- "icon" : ["sizes"],
- "iframe" : ["sandbox"],
- "output" : ["for"],
- }
-
- def set_up_substitutions(self, tag):
- # We are only interested in
as a
-# string.
-#
-# XXX This code can be removed once most Python 3 users are on 3.2.3.
-if major == 3 and minor == 2 and not CONSTRUCTOR_TAKES_STRICT:
- import re
- attrfind_tolerant = re.compile(
- r'\s*((?<=[\'"\s])[^\s/>][^\s/=>]*)(\s*=+\s*'
- r'(\'[^\']*\'|"[^"]*"|(?![\'"])[^>\s]*))?')
- HTMLParserTreeBuilder.attrfind_tolerant = attrfind_tolerant
-
- locatestarttagend = re.compile(r"""
- <[a-zA-Z][-.a-zA-Z0-9:_]* # tag name
- (?:\s+ # whitespace before attribute name
- (?:[a-zA-Z_][-.:a-zA-Z0-9_]* # attribute name
- (?:\s*=\s* # value indicator
- (?:'[^']*' # LITA-enclosed value
- |\"[^\"]*\" # LIT-enclosed value
- |[^'\">\s]+ # bare value
- )
- )?
- )
- )*
- \s* # trailing whitespace
-""", re.VERBOSE)
- BeautifulSoupHTMLParser.locatestarttagend = locatestarttagend
-
- from html.parser import tagfind, attrfind
-
- def parse_starttag(self, i):
- self.__starttag_text = None
- endpos = self.check_for_whole_start_tag(i)
- if endpos < 0:
- return endpos
- rawdata = self.rawdata
- self.__starttag_text = rawdata[i:endpos]
-
- # Now parse the data between i+1 and j into a tag and attrs
- attrs = []
- match = tagfind.match(rawdata, i+1)
- assert match, 'unexpected call to parse_starttag()'
- k = match.end()
- self.lasttag = tag = rawdata[i+1:k].lower()
- while k < endpos:
- if self.strict:
- m = attrfind.match(rawdata, k)
- else:
- m = attrfind_tolerant.match(rawdata, k)
- if not m:
- break
- attrname, rest, attrvalue = m.group(1, 2, 3)
- if not rest:
- attrvalue = None
- elif attrvalue[:1] == '\'' == attrvalue[-1:] or \
- attrvalue[:1] == '"' == attrvalue[-1:]:
- attrvalue = attrvalue[1:-1]
- if attrvalue:
- attrvalue = self.unescape(attrvalue)
- attrs.append((attrname.lower(), attrvalue))
- k = m.end()
-
- end = rawdata[k:endpos].strip()
- if end not in (">", "/>"):
- lineno, offset = self.getpos()
- if "\n" in self.__starttag_text:
- lineno = lineno + self.__starttag_text.count("\n")
- offset = len(self.__starttag_text) \
- - self.__starttag_text.rfind("\n")
- else:
- offset = offset + len(self.__starttag_text)
- if self.strict:
- self.error("junk characters in start tag: %r"
- % (rawdata[k:endpos][:20],))
- self.handle_data(rawdata[i:endpos])
- return endpos
- if end.endswith('/>'):
- # XHTML-style empty tag: Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu! '
- soup = self.soup(markup)
- self.assertEqual(u'Sacr\xe9 bleu!', soup.root.string)
-
- def test_popping_namespaced_tag(self):
- markup = 'b 2012-07-02T20:33:42Z c d '
- + b'0' * (2**12)
- + b' ')
- soup = self.soup(markup)
- self.assertEqual(soup.encode("utf-8"), markup)
-
-
- def test_tags_are_empty_element_if_and_only_if_they_are_empty(self):
- self.assertSoupEquals("", "
")
- self.assertSoupEquals("foo
")
-
- def test_namespaces_are_preserved(self):
- markup = 'This tag is in the a namespace This tag is in the b namespace 20010504
'
- soup = self.soup(markup)
- self.assertEqual(unicode(soup.p), markup)
-
- def test_namespaced_attributes(self):
- markup = 'bar '
- soup = self.soup(markup)
- self.assertEqual(unicode(soup.foo), markup)
-
-class HTML5TreeBuilderSmokeTest(HTMLTreeBuilderSmokeTest):
- """Smoke test for a tree builder that supports HTML5."""
-
- def test_real_xhtml_document(self):
- # Since XHTML is not HTML5, HTML5 parsers are not tested to handle
- # XHTML documents in any particular way.
- pass
-
- def test_html_tags_have_namespace(self):
- markup = ""
- soup = self.soup(markup)
- self.assertEqual("http://www.w3.org/1999/xhtml", soup.a.namespace)
-
- def test_svg_tags_have_namespace(self):
- markup = '5 `_.
-
- Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
- multipart files, and parameters with simple Python dictionaries, and access the
- response data in the same way. It's powered by httplib and `urllib3
- `_, but it does all the hard work and crazy
- hacks for you.
-
-
- Features
- --------
-
- - International Domains and URLs
- - Keep-Alive & Connection Pooling
- - Sessions with Cookie Persistence
- - Browser-style SSL Verification
- - Basic/Digest Authentication
- - Elegant Key/Value Cookies
- - Automatic Decompression
- - Unicode Response Bodies
- - Multipart File Uploads
- - Connection Timeouts
- - Thread-safety
- - HTTP(S) proxy support
-
-
- Installation
- ------------
-
- To install Requests, simply:
-
- .. code-block:: bash
-
- $ pip install requests
-
- Or, if you absolutely must:
-
- .. code-block:: bash
-
- $ easy_install requests
-
- But, you really shouldn't do that.
-
-
- Documentation
- -------------
-
- Documentation is available at http://docs.python-requests.org/.
-
-
- Contribute
- ----------
-
- #. Check for open issues or open a fresh issue to start a discussion around a feature idea or a bug. There is a `Contributor Friendly`_ tag for issues that should be ideal for people who are not very familiar with the codebase yet.
- #. If you feel uncomfortable or uncertain about an issue or your changes, feel free to email @sigmavirus24 and he will happily help you via email, Skype, remote pairing or whatever you are comfortable with.
- #. Fork `the repository`_ on GitHub to start making your changes to the **master** branch (or branch off of it).
- #. Write a test which shows that the bug was fixed or that the feature works as expected.
- #. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_.
-
- .. _`the repository`: http://github.com/kennethreitz/requests
- .. _AUTHORS: https://github.com/kennethreitz/requests/blob/master/AUTHORS.rst
- .. _Contributor Friendly: https://github.com/kennethreitz/requests/issues?direction=desc&labels=Contributor+Friendly&page=1&sort=updated&state=open
-
-
- .. :changelog:
-
- Release History
- ---------------
-
- 2.2.1 (2014-01-23)
- ++++++++++++++++++
-
- **Bugfixes**
-
- - Fixes incorrect parsing of proxy credentials that contain a literal or encoded '#' character.
- - Assorted urllib3 fixes.
-
- 2.2.0 (2014-01-09)
- ++++++++++++++++++
-
- **API Changes**
-
- - New exception: ``ContentDecodingError``. Raised instead of ``urllib3``
- ``DecodeError`` exceptions.
-
- **Bugfixes**
-
- - Avoid many many exceptions from the buggy implementation of ``proxy_bypass`` on OS X in Python 2.6.
- - Avoid crashing when attempting to get authentication credentials from ~/.netrc when running as a user without a home directory.
- - Use the correct pool size for pools of connections to proxies.
- - Fix iteration of ``CookieJar`` objects.
- - Ensure that cookies are persisted over redirect.
- - Switch back to using chardet, since it has merged with charade.
-
- 2.1.0 (2013-12-05)
- ++++++++++++++++++
-
- - Updated CA Bundle, of course.
- - Cookies set on individual Requests through a ``Session`` (e.g. via ``Session.get()``) are no longer persisted to the ``Session``.
- - Clean up connections when we hit problems during chunked upload, rather than leaking them.
- - Return connections to the pool when a chunked upload is successful, rather than leaking it.
- - Match the HTTPbis recommendation for HTTP 301 redirects.
- - Prevent hanging when using streaming uploads and Digest Auth when a 401 is received.
- - Values of headers set by Requests are now always the native string type.
- - Fix previously broken SNI support.
- - Fix accessing HTTP proxies using proxy authentication.
- - Unencode HTTP Basic usernames and passwords extracted from URLs.
- - Support for IP address ranges for no_proxy environment variable
- - Parse headers correctly when users override the default ``Host:`` header.
- - Avoid munging the URL in case of case-sensitive servers.
- - Looser URL handling for non-HTTP/HTTPS urls.
- - Accept unicode methods in Python 2.6 and 2.7.
- - More resilient cookie handling.
- - Make ``Response`` objects pickleable.
- - Actually added MD5-sess to Digest Auth instead of pretending to like last time.
- - Updated internal urllib3.
- - Fixed @Lukasa's lack of taste.
-
- 2.0.1 (2013-10-24)
- ++++++++++++++++++
-
- - Updated included CA Bundle with new mistrusts and automated process for the future
- - Added MD5-sess to Digest Auth
- - Accept per-file headers in multipart file POST messages.
- - Fixed: Don't send the full URL on CONNECT messages.
- - Fixed: Correctly lowercase a redirect scheme.
- - Fixed: Cookies not persisted when set via functional API.
- - Fixed: Translate urllib3 ProxyError into a requests ProxyError derived from ConnectionError.
- - Updated internal urllib3 and chardet.
-
- 2.0.0 (2013-09-24)
- ++++++++++++++++++
-
- **API Changes:**
-
- - Keys in the Headers dictionary are now native strings on all Python versions,
- i.e. bytestrings on Python 2, unicode on Python 3.
- - Proxy URLs now *must* have an explicit scheme. A ``MissingSchema`` exception
- will be raised if they don't.
- - Timeouts now apply to read time if ``Stream=False``.
- - ``RequestException`` is now a subclass of ``IOError``, not ``RuntimeError``.
- - Added new method to ``PreparedRequest`` objects: ``PreparedRequest.copy()``.
- - Added new method to ``Session`` objects: ``Session.update_request()``. This
- method updates a ``Request`` object with the data (e.g. cookies) stored on
- the ``Session``.
- - Added new method to ``Session`` objects: ``Session.prepare_request()``. This
- method updates and prepares a ``Request`` object, and returns the
- corresponding ``PreparedRequest`` object.
- - Added new method to ``HTTPAdapter`` objects: ``HTTPAdapter.proxy_headers()``.
- This should not be called directly, but improves the subclass interface.
- - ``httplib.IncompleteRead`` exceptions caused by incorrect chunked encoding
- will now raise a Requests ``ChunkedEncodingError`` instead.
- - Invalid percent-escape sequences now cause a Requests ``InvalidURL``
- exception to be raised.
- - HTTP 208 no longer uses reason phrase ``"im_used"``. Correctly uses
- ``"already_reported"``.
- - HTTP 226 reason added (``"im_used"``).
-
- **Bugfixes:**
-
- - Vastly improved proxy support, including the CONNECT verb. Special thanks to
- the many contributors who worked towards this improvement.
- - Cookies are now properly managed when 401 authentication responses are
- received.
- - Chunked encoding fixes.
- - Support for mixed case schemes.
- - Better handling of streaming downloads.
- - Retrieve environment proxies from more locations.
- - Minor cookies fixes.
- - Improved redirect behaviour.
- - Improved streaming behaviour, particularly for compressed data.
- - Miscellaneous small Python 3 text encoding bugs.
- - ``.netrc`` no longer overrides explicit auth.
- - Cookies set by hooks are now correctly persisted on Sessions.
- - Fix problem with cookies that specify port numbers in their host field.
- - ``BytesIO`` can be used to perform streaming uploads.
- - More generous parsing of the ``no_proxy`` environment variable.
- - Non-string objects can be passed in data values alongside files.
-
- 1.2.3 (2013-05-25)
- ++++++++++++++++++
-
- - Simple packaging fix
-
-
- 1.2.2 (2013-05-23)
- ++++++++++++++++++
-
- - Simple packaging fix
-
-
- 1.2.1 (2013-05-20)
- ++++++++++++++++++
-
- - Python 3.3.2 compatibility
- - Always percent-encode location headers
- - Fix connection adapter matching to be most-specific first
- - new argument to the default connection adapter for passing a block argument
- - prevent a KeyError when there's no link headers
-
- 1.2.0 (2013-03-31)
- ++++++++++++++++++
-
- - Fixed cookies on sessions and on requests
- - Significantly change how hooks are dispatched - hooks now receive all the
- arguments specified by the user when making a request so hooks can make a
- secondary request with the same parameters. This is especially necessary for
- authentication handler authors
- - certifi support was removed
- - Fixed bug where using OAuth 1 with body ``signature_type`` sent no data
- - Major proxy work thanks to @Lukasa including parsing of proxy authentication
- from the proxy url
- - Fix DigestAuth handling too many 401s
- - Update vendored urllib3 to include SSL bug fixes
- - Allow keyword arguments to be passed to ``json.loads()`` via the
- ``Response.json()`` method
- - Don't send ``Content-Length`` header by default on ``GET`` or ``HEAD``
- requests
- - Add ``elapsed`` attribute to ``Response`` objects to time how long a request
- took.
- - Fix ``RequestsCookieJar``
- - Sessions and Adapters are now picklable, i.e., can be used with the
- multiprocessing library
- - Update charade to version 1.0.3
-
- The change in how hooks are dispatched will likely cause a great deal of
- issues.
-
- 1.1.0 (2013-01-10)
- ++++++++++++++++++
-
- - CHUNKED REQUESTS
- - Support for iterable response bodies
- - Assume servers persist redirect params
- - Allow explicit content types to be specified for file data
- - Make merge_kwargs case-insensitive when looking up keys
-
- 1.0.3 (2012-12-18)
- ++++++++++++++++++
-
- - Fix file upload encoding bug
- - Fix cookie behavior
-
- 1.0.2 (2012-12-17)
- ++++++++++++++++++
-
- - Proxy fix for HTTPAdapter.
-
- 1.0.1 (2012-12-17)
- ++++++++++++++++++
-
- - Cert verification exception bug.
- - Proxy fix for HTTPAdapter.
-
- 1.0.0 (2012-12-17)
- ++++++++++++++++++
-
- - Massive Refactor and Simplification
- - Switch to Apache 2.0 license
- - Swappable Connection Adapters
- - Mountable Connection Adapters
- - Mutable ProcessedRequest chain
- - /s/prefetch/stream
- - Removal of all configuration
- - Standard library logging
- - Make Response.json() callable, not property.
- - Usage of new charade project, which provides python 2 and 3 simultaneous chardet.
- - Removal of all hooks except 'response'
- - Removal of all authentication helpers (OAuth, Kerberos)
-
- This is not a backwards compatible change.
-
- 0.14.2 (2012-10-27)
- +++++++++++++++++++
-
- - Improved mime-compatible JSON handling
- - Proxy fixes
- - Path hack fixes
- - Case-Insensistive Content-Encoding headers
- - Support for CJK parameters in form posts
-
-
- 0.14.1 (2012-10-01)
- +++++++++++++++++++
-
- - Python 3.3 Compatibility
- - Simply default accept-encoding
- - Bugfixes
-
-
- 0.14.0 (2012-09-02)
- ++++++++++++++++++++
-
- - No more iter_content errors if already downloaded.
-
- 0.13.9 (2012-08-25)
- +++++++++++++++++++
-
- - Fix for OAuth + POSTs
- - Remove exception eating from dispatch_hook
- - General bugfixes
-
- 0.13.8 (2012-08-21)
- +++++++++++++++++++
-
- - Incredible Link header support :)
-
- 0.13.7 (2012-08-19)
- +++++++++++++++++++
-
- - Support for (key, value) lists everywhere.
- - Digest Authentication improvements.
- - Ensure proxy exclusions work properly.
- - Clearer UnicodeError exceptions.
- - Automatic casting of URLs to tsrings (fURL and such)
- - Bugfixes.
-
- 0.13.6 (2012-08-06)
- +++++++++++++++++++
-
- - Long awaited fix for hanging connections!
-
- 0.13.5 (2012-07-27)
- +++++++++++++++++++
-
- - Packaging fix
-
- 0.13.4 (2012-07-27)
- +++++++++++++++++++
-
- - GSSAPI/Kerberos authentication!
- - App Engine 2.7 Fixes!
- - Fix leaking connections (from urllib3 update)
- - OAuthlib path hack fix
- - OAuthlib URL parameters fix.
-
- 0.13.3 (2012-07-12)
- +++++++++++++++++++
-
- - Use simplejson if available.
- - Do not hide SSLErrors behind Timeouts.
- - Fixed param handling with urls containing fragments.
- - Significantly improved information in User Agent.
- - client certificates are ignored when verify=False
-
- 0.13.2 (2012-06-28)
- +++++++++++++++++++
-
- - Zero dependencies (once again)!
- - New: Response.reason
- - Sign querystring parameters in OAuth 1.0
- - Client certificates no longer ignored when verify=False
- - Add openSUSE certificate support
-
- 0.13.1 (2012-06-07)
- +++++++++++++++++++
-
- - Allow passing a file or file-like object as data.
- - Allow hooks to return responses that indicate errors.
- - Fix Response.text and Response.json for body-less responses.
-
- 0.13.0 (2012-05-29)
- +++++++++++++++++++
-
- - Removal of Requests.async in favor of `grequests `_
- - Allow disabling of cookie persistiance.
- - New implimentation of safe_mode
- - cookies.get now supports default argument
- - Session cookies not saved when Session.request is called with return_response=False
- - Env: no_proxy support.
- - RequestsCookieJar improvements.
- - Various bug fixes.
-
- 0.12.1 (2012-05-08)
- +++++++++++++++++++
-
- - New ``Response.json`` property.
- - Ability to add string file uploads.
- - Fix out-of-range issue with iter_lines.
- - Fix iter_content default size.
- - Fix POST redirects containing files.
-
- 0.12.0 (2012-05-02)
- +++++++++++++++++++
-
- - EXPERIMENTAL OAUTH SUPPORT!
- - Proper CookieJar-backed cookies interface with awesome dict-like interface.
- - Speed fix for non-iterated content chunks.
- - Move ``pre_request`` to a more usable place.
- - New ``pre_send`` hook.
- - Lazily encode data, params, files.
- - Load system Certificate Bundle if ``certify`` isn't available.
- - Cleanups, fixes.
-
- 0.11.2 (2012-04-22)
- +++++++++++++++++++
-
- - Attempt to use the OS's certificate bundle if ``certifi`` isn't available.
- - Infinite digest auth redirect fix.
- - Multi-part file upload improvements.
- - Fix decoding of invalid %encodings in URLs.
- - If there is no content in a response don't throw an error the second time that content is attempted to be read.
- - Upload data on redirects.
-
- 0.11.1 (2012-03-30)
- +++++++++++++++++++
-
- * POST redirects now break RFC to do what browsers do: Follow up with a GET.
- * New ``strict_mode`` configuration to disable new redirect behavior.
-
-
- 0.11.0 (2012-03-14)
- +++++++++++++++++++
-
- * Private SSL Certificate support
- * Remove select.poll from Gevent monkeypatching
- * Remove redundant generator for chunked transfer encoding
- * Fix: Response.ok raises Timeout Exception in safe_mode
-
- 0.10.8 (2012-03-09)
- +++++++++++++++++++
-
- * Generate chunked ValueError fix
- * Proxy configuration by environment variables
- * Simplification of iter_lines.
- * New `trust_env` configuration for disabling system/environment hints.
- * Suppress cookie errors.
-
- 0.10.7 (2012-03-07)
- +++++++++++++++++++
-
- * `encode_uri` = False
-
- 0.10.6 (2012-02-25)
- +++++++++++++++++++
-
- * Allow '=' in cookies.
-
- 0.10.5 (2012-02-25)
- +++++++++++++++++++
-
- * Response body with 0 content-length fix.
- * New async.imap.
- * Don't fail on netrc.
-
-
- 0.10.4 (2012-02-20)
- +++++++++++++++++++
-
- * Honor netrc.
-
- 0.10.3 (2012-02-20)
- +++++++++++++++++++
-
- * HEAD requests don't follow redirects anymore.
- * raise_for_status() doesn't raise for 3xx anymore.
- * Make Session objects picklable.
- * ValueError for invalid schema URLs.
-
- 0.10.2 (2012-01-15)
- +++++++++++++++++++
-
- * Vastly improved URL quoting.
- * Additional allowed cookie key values.
- * Attempted fix for "Too many open files" Error
- * Replace unicode errors on first pass, no need for second pass.
- * Append '/' to bare-domain urls before query insertion.
- * Exceptions now inherit from RuntimeError.
- * Binary uploads + auth fix.
- * Bugfixes.
-
-
- 0.10.1 (2012-01-23)
- +++++++++++++++++++
-
- * PYTHON 3 SUPPORT!
- * Dropped 2.5 Support. (*Backwards Incompatible*)
-
- 0.10.0 (2012-01-21)
- +++++++++++++++++++
-
- * ``Response.content`` is now bytes-only. (*Backwards Incompatible*)
- * New ``Response.text`` is unicode-only.
- * If no ``Response.encoding`` is specified and ``chardet`` is available, ``Respoonse.text`` will guess an encoding.
- * Default to ISO-8859-1 (Western) encoding for "text" subtypes.
- * Removal of `decode_unicode`. (*Backwards Incompatible*)
- * New multiple-hooks system.
- * New ``Response.register_hook`` for registering hooks within the pipeline.
- * ``Response.url`` is now Unicode.
-
- 0.9.3 (2012-01-18)
- ++++++++++++++++++
-
- * SSL verify=False bugfix (apparent on windows machines).
-
- 0.9.2 (2012-01-18)
- ++++++++++++++++++
-
- * Asynchronous async.send method.
- * Support for proper chunk streams with boundaries.
- * session argument for Session classes.
- * Print entire hook tracebacks, not just exception instance.
- * Fix response.iter_lines from pending next line.
- * Fix but in HTTP-digest auth w/ URI having query strings.
- * Fix in Event Hooks section.
- * Urllib3 update.
-
-
- 0.9.1 (2012-01-06)
- ++++++++++++++++++
-
- * danger_mode for automatic Response.raise_for_status()
- * Response.iter_lines refactor
-
- 0.9.0 (2011-12-28)
- ++++++++++++++++++
-
- * verify ssl is default.
-
-
- 0.8.9 (2011-12-28)
- ++++++++++++++++++
-
- * Packaging fix.
-
-
- 0.8.8 (2011-12-28)
- ++++++++++++++++++
-
- * SSL CERT VERIFICATION!
- * Release of Cerifi: Mozilla's cert list.
- * New 'verify' argument for SSL requests.
- * Urllib3 update.
-
- 0.8.7 (2011-12-24)
- ++++++++++++++++++
-
- * iter_lines last-line truncation fix
- * Force safe_mode for async requests
- * Handle safe_mode exceptions more consistently
- * Fix iteration on null responses in safe_mode
-
- 0.8.6 (2011-12-18)
- ++++++++++++++++++
-
- * Socket timeout fixes.
- * Proxy Authorization support.
-
- 0.8.5 (2011-12-14)
- ++++++++++++++++++
-
- * Response.iter_lines!
-
- 0.8.4 (2011-12-11)
- ++++++++++++++++++
-
- * Prefetch bugfix.
- * Added license to installed version.
-
- 0.8.3 (2011-11-27)
- ++++++++++++++++++
-
- * Converted auth system to use simpler callable objects.
- * New session parameter to API methods.
- * Display full URL while logging.
-
- 0.8.2 (2011-11-19)
- ++++++++++++++++++
-
- * New Unicode decoding system, based on over-ridable `Response.encoding`.
- * Proper URL slash-quote handling.
- * Cookies with ``[``, ``]``, and ``_`` allowed.
-
- 0.8.1 (2011-11-15)
- ++++++++++++++++++
-
- * URL Request path fix
- * Proxy fix.
- * Timeouts fix.
-
- 0.8.0 (2011-11-13)
- ++++++++++++++++++
-
- * Keep-alive support!
- * Complete removal of Urllib2
- * Complete removal of Poster
- * Complete removal of CookieJars
- * New ConnectionError raising
- * Safe_mode for error catching
- * prefetch parameter for request methods
- * OPTION method
- * Async pool size throttling
- * File uploads send real names
- * Vendored in urllib3
-
- 0.7.6 (2011-11-07)
- ++++++++++++++++++
-
- * Digest authentication bugfix (attach query data to path)
-
- 0.7.5 (2011-11-04)
- ++++++++++++++++++
-
- * Response.content = None if there was an invalid repsonse.
- * Redirection auth handling.
-
- 0.7.4 (2011-10-26)
- ++++++++++++++++++
-
- * Session Hooks fix.
-
- 0.7.3 (2011-10-23)
- ++++++++++++++++++
-
- * Digest Auth fix.
-
-
- 0.7.2 (2011-10-23)
- ++++++++++++++++++
-
- * PATCH Fix.
-
-
- 0.7.1 (2011-10-23)
- ++++++++++++++++++
-
- * Move away from urllib2 authentication handling.
- * Fully Remove AuthManager, AuthObject, &c.
- * New tuple-based auth system with handler callbacks.
-
-
- 0.7.0 (2011-10-22)
- ++++++++++++++++++
-
- * Sessions are now the primary interface.
- * Deprecated InvalidMethodException.
- * PATCH fix.
- * New config system (no more global settings).
-
-
- 0.6.6 (2011-10-19)
- ++++++++++++++++++
-
- * Session parameter bugfix (params merging).
-
-
- 0.6.5 (2011-10-18)
- ++++++++++++++++++
-
- * Offline (fast) test suite.
- * Session dictionary argument merging.
-
-
- 0.6.4 (2011-10-13)
- ++++++++++++++++++
-
- * Automatic decoding of unicode, based on HTTP Headers.
- * New ``decode_unicode`` setting.
- * Removal of ``r.read/close`` methods.
- * New ``r.faw`` interface for advanced response usage.*
- * Automatic expansion of parameterized headers.
-
-
- 0.6.3 (2011-10-13)
- ++++++++++++++++++
-
- * Beautiful ``requests.async`` module, for making async requests w/ gevent.
-
-
- 0.6.2 (2011-10-09)
- ++++++++++++++++++
-
- * GET/HEAD obeys allow_redirects=False.
-
-
- 0.6.1 (2011-08-20)
- ++++++++++++++++++
-
- * Enhanced status codes experience ``\o/``
- * Set a maximum number of redirects (``settings.max_redirects``)
- * Full Unicode URL support
- * Support for protocol-less redirects.
- * Allow for arbitrary request types.
- * Bugfixes
-
-
- 0.6.0 (2011-08-17)
- ++++++++++++++++++
-
- * New callback hook system
- * New persistient sessions object and context manager
- * Transparent Dict-cookie handling
- * Status code reference object
- * Removed Response.cached
- * Added Response.request
- * All args are kwargs
- * Relative redirect support
- * HTTPError handling improvements
- * Improved https testing
- * Bugfixes
-
-
- 0.5.1 (2011-07-23)
- ++++++++++++++++++
-
- * International Domain Name Support!
- * Access headers without fetching entire body (``read()``)
- * Use lists as dicts for parameters
- * Add Forced Basic Authentication
- * Forced Basic is default authentication type
- * ``python-requests.org`` default User-Agent header
- * CaseInsensitiveDict lower-case caching
- * Response.history bugfix
-
-
- 0.5.0 (2011-06-21)
- ++++++++++++++++++
-
- * PATCH Support
- * Support for Proxies
- * HTTPBin Test Suite
- * Redirect Fixes
- * settings.verbose stream writing
- * Querystrings for all methods
- * URLErrors (Connection Refused, Timeout, Invalid URLs) are treated as explicity raised
- ``r.requests.get('hwe://blah'); r.raise_for_status()``
-
-
- 0.4.1 (2011-05-22)
- ++++++++++++++++++
-
- * Improved Redirection Handling
- * New 'allow_redirects' param for following non-GET/HEAD Redirects
- * Settings module refactoring
-
-
- 0.4.0 (2011-05-15)
- ++++++++++++++++++
-
- * Response.history: list of redirected responses
- * Case-Insensitive Header Dictionaries!
- * Unicode URLs
-
-
- 0.3.4 (2011-05-14)
- ++++++++++++++++++
-
- * Urllib2 HTTPAuthentication Recursion fix (Basic/Digest)
- * Internal Refactor
- * Bytes data upload Bugfix
-
-
-
- 0.3.3 (2011-05-12)
- ++++++++++++++++++
-
- * Request timeouts
- * Unicode url-encoded data
- * Settings context manager and module
-
-
- 0.3.2 (2011-04-15)
- ++++++++++++++++++
-
- * Automatic Decompression of GZip Encoded Content
- * AutoAuth Support for Tupled HTTP Auth
-
-
- 0.3.1 (2011-04-01)
- ++++++++++++++++++
-
- * Cookie Changes
- * Response.read()
- * Poster fix
-
-
- 0.3.0 (2011-02-25)
- ++++++++++++++++++
-
- * Automatic Authentication API Change
- * Smarter Query URL Parameterization
- * Allow file uploads and POST data together
- * New Authentication Manager System
- - Simpler Basic HTTP System
- - Supports all build-in urllib2 Auths
- - Allows for custom Auth Handlers
-
-
- 0.2.4 (2011-02-19)
- ++++++++++++++++++
-
- * Python 2.5 Support
- * PyPy-c v1.4 Support
- * Auto-Authentication tests
- * Improved Request object constructor
-
- 0.2.3 (2011-02-15)
- ++++++++++++++++++
-
- * New HTTPHandling Methods
- - Response.__nonzero__ (false if bad HTTP Status)
- - Response.ok (True if expected HTTP Status)
- - Response.error (Logged HTTPError if bad HTTP Status)
- - Response.raise_for_status() (Raises stored HTTPError)
-
-
- 0.2.2 (2011-02-14)
- ++++++++++++++++++
-
- * Still handles request in the event of an HTTPError. (Issue #2)
- * Eventlet and Gevent Monkeypatch support.
- * Cookie Support (Issue #1)
-
-
- 0.2.1 (2011-02-14)
- ++++++++++++++++++
-
- * Added file attribute to POST and PUT requests for multipart-encode file uploads.
- * Added Request.url attribute for context and redirects
-
-
- 0.2.0 (2011-02-14)
- ++++++++++++++++++
-
- * Birth!
-
-
- 0.0.1 (2011-02-13)
- ++++++++++++++++++
-
- * Frustration
- * Conception
-
-
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: Natural Language :: English
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
diff --git a/PythonHome/thirdparty/requests-2.2.1.dist-info/METADATA b/PythonHome/thirdparty/requests-2.2.1.dist-info/METADATA
deleted file mode 100644
index 989d4b9d4..000000000
--- a/PythonHome/thirdparty/requests-2.2.1.dist-info/METADATA
+++ /dev/null
@@ -1,896 +0,0 @@
-Metadata-Version: 2.0
-Name: requests
-Version: 2.2.1
-Summary: Python HTTP for Humans.
-Home-page: http://python-requests.org
-Author: Kenneth Reitz
-Author-email: me@kennethreitz.com
-License: Copyright 2014 Kenneth Reitz
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-Description: Requests: HTTP for Humans
- =========================
-
- .. image:: https://badge.fury.io/py/requests.png
- :target: http://badge.fury.io/py/requests
-
- .. image:: https://pypip.in/d/requests/badge.png
- :target: https://crate.io/packages/requests/
-
-
- Requests is an Apache2 Licensed HTTP library, written in Python, for human
- beings.
-
- Most existing Python modules for sending HTTP requests are extremely
- verbose and cumbersome. Python's builtin urllib2 module provides most of
- the HTTP capabilities you should need, but the api is thoroughly broken.
- It requires an enormous amount of work (even method overrides) to
- perform the simplest of tasks.
-
- Things shouldn't be this way. Not in Python.
-
- .. code-block:: pycon
-
- >>> r = requests.get('https://api.github.com', auth=('user', 'pass'))
- >>> r.status_code
- 204
- >>> r.headers['content-type']
- 'application/json'
- >>> r.text
- ...
-
- See `the same code, without Requests `_.
-
- Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
- multipart files, and parameters with simple Python dictionaries, and access the
- response data in the same way. It's powered by httplib and `urllib3
- `_, but it does all the hard work and crazy
- hacks for you.
-
-
- Features
- --------
-
- - International Domains and URLs
- - Keep-Alive & Connection Pooling
- - Sessions with Cookie Persistence
- - Browser-style SSL Verification
- - Basic/Digest Authentication
- - Elegant Key/Value Cookies
- - Automatic Decompression
- - Unicode Response Bodies
- - Multipart File Uploads
- - Connection Timeouts
- - Thread-safety
- - HTTP(S) proxy support
-
-
- Installation
- ------------
-
- To install Requests, simply:
-
- .. code-block:: bash
-
- $ pip install requests
-
- Or, if you absolutely must:
-
- .. code-block:: bash
-
- $ easy_install requests
-
- But, you really shouldn't do that.
-
-
- Documentation
- -------------
-
- Documentation is available at http://docs.python-requests.org/.
-
-
- Contribute
- ----------
-
- #. Check for open issues or open a fresh issue to start a discussion around a feature idea or a bug. There is a `Contributor Friendly`_ tag for issues that should be ideal for people who are not very familiar with the codebase yet.
- #. If you feel uncomfortable or uncertain about an issue or your changes, feel free to email @sigmavirus24 and he will happily help you via email, Skype, remote pairing or whatever you are comfortable with.
- #. Fork `the repository`_ on GitHub to start making your changes to the **master** branch (or branch off of it).
- #. Write a test which shows that the bug was fixed or that the feature works as expected.
- #. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_.
-
- .. _`the repository`: http://github.com/kennethreitz/requests
- .. _AUTHORS: https://github.com/kennethreitz/requests/blob/master/AUTHORS.rst
- .. _Contributor Friendly: https://github.com/kennethreitz/requests/issues?direction=desc&labels=Contributor+Friendly&page=1&sort=updated&state=open
-
-
- .. :changelog:
-
- Release History
- ---------------
-
- 2.2.1 (2014-01-23)
- ++++++++++++++++++
-
- **Bugfixes**
-
- - Fixes incorrect parsing of proxy credentials that contain a literal or encoded '#' character.
- - Assorted urllib3 fixes.
-
- 2.2.0 (2014-01-09)
- ++++++++++++++++++
-
- **API Changes**
-
- - New exception: ``ContentDecodingError``. Raised instead of ``urllib3``
- ``DecodeError`` exceptions.
-
- **Bugfixes**
-
- - Avoid many many exceptions from the buggy implementation of ``proxy_bypass`` on OS X in Python 2.6.
- - Avoid crashing when attempting to get authentication credentials from ~/.netrc when running as a user without a home directory.
- - Use the correct pool size for pools of connections to proxies.
- - Fix iteration of ``CookieJar`` objects.
- - Ensure that cookies are persisted over redirect.
- - Switch back to using chardet, since it has merged with charade.
-
- 2.1.0 (2013-12-05)
- ++++++++++++++++++
-
- - Updated CA Bundle, of course.
- - Cookies set on individual Requests through a ``Session`` (e.g. via ``Session.get()``) are no longer persisted to the ``Session``.
- - Clean up connections when we hit problems during chunked upload, rather than leaking them.
- - Return connections to the pool when a chunked upload is successful, rather than leaking it.
- - Match the HTTPbis recommendation for HTTP 301 redirects.
- - Prevent hanging when using streaming uploads and Digest Auth when a 401 is received.
- - Values of headers set by Requests are now always the native string type.
- - Fix previously broken SNI support.
- - Fix accessing HTTP proxies using proxy authentication.
- - Unencode HTTP Basic usernames and passwords extracted from URLs.
- - Support for IP address ranges for no_proxy environment variable
- - Parse headers correctly when users override the default ``Host:`` header.
- - Avoid munging the URL in case of case-sensitive servers.
- - Looser URL handling for non-HTTP/HTTPS urls.
- - Accept unicode methods in Python 2.6 and 2.7.
- - More resilient cookie handling.
- - Make ``Response`` objects pickleable.
- - Actually added MD5-sess to Digest Auth instead of pretending to like last time.
- - Updated internal urllib3.
- - Fixed @Lukasa's lack of taste.
-
- 2.0.1 (2013-10-24)
- ++++++++++++++++++
-
- - Updated included CA Bundle with new mistrusts and automated process for the future
- - Added MD5-sess to Digest Auth
- - Accept per-file headers in multipart file POST messages.
- - Fixed: Don't send the full URL on CONNECT messages.
- - Fixed: Correctly lowercase a redirect scheme.
- - Fixed: Cookies not persisted when set via functional API.
- - Fixed: Translate urllib3 ProxyError into a requests ProxyError derived from ConnectionError.
- - Updated internal urllib3 and chardet.
-
- 2.0.0 (2013-09-24)
- ++++++++++++++++++
-
- **API Changes:**
-
- - Keys in the Headers dictionary are now native strings on all Python versions,
- i.e. bytestrings on Python 2, unicode on Python 3.
- - Proxy URLs now *must* have an explicit scheme. A ``MissingSchema`` exception
- will be raised if they don't.
- - Timeouts now apply to read time if ``Stream=False``.
- - ``RequestException`` is now a subclass of ``IOError``, not ``RuntimeError``.
- - Added new method to ``PreparedRequest`` objects: ``PreparedRequest.copy()``.
- - Added new method to ``Session`` objects: ``Session.update_request()``. This
- method updates a ``Request`` object with the data (e.g. cookies) stored on
- the ``Session``.
- - Added new method to ``Session`` objects: ``Session.prepare_request()``. This
- method updates and prepares a ``Request`` object, and returns the
- corresponding ``PreparedRequest`` object.
- - Added new method to ``HTTPAdapter`` objects: ``HTTPAdapter.proxy_headers()``.
- This should not be called directly, but improves the subclass interface.
- - ``httplib.IncompleteRead`` exceptions caused by incorrect chunked encoding
- will now raise a Requests ``ChunkedEncodingError`` instead.
- - Invalid percent-escape sequences now cause a Requests ``InvalidURL``
- exception to be raised.
- - HTTP 208 no longer uses reason phrase ``"im_used"``. Correctly uses
- ``"already_reported"``.
- - HTTP 226 reason added (``"im_used"``).
-
- **Bugfixes:**
-
- - Vastly improved proxy support, including the CONNECT verb. Special thanks to
- the many contributors who worked towards this improvement.
- - Cookies are now properly managed when 401 authentication responses are
- received.
- - Chunked encoding fixes.
- - Support for mixed case schemes.
- - Better handling of streaming downloads.
- - Retrieve environment proxies from more locations.
- - Minor cookies fixes.
- - Improved redirect behaviour.
- - Improved streaming behaviour, particularly for compressed data.
- - Miscellaneous small Python 3 text encoding bugs.
- - ``.netrc`` no longer overrides explicit auth.
- - Cookies set by hooks are now correctly persisted on Sessions.
- - Fix problem with cookies that specify port numbers in their host field.
- - ``BytesIO`` can be used to perform streaming uploads.
- - More generous parsing of the ``no_proxy`` environment variable.
- - Non-string objects can be passed in data values alongside files.
-
- 1.2.3 (2013-05-25)
- ++++++++++++++++++
-
- - Simple packaging fix
-
-
- 1.2.2 (2013-05-23)
- ++++++++++++++++++
-
- - Simple packaging fix
-
-
- 1.2.1 (2013-05-20)
- ++++++++++++++++++
-
- - Python 3.3.2 compatibility
- - Always percent-encode location headers
- - Fix connection adapter matching to be most-specific first
- - new argument to the default connection adapter for passing a block argument
- - prevent a KeyError when there's no link headers
-
- 1.2.0 (2013-03-31)
- ++++++++++++++++++
-
- - Fixed cookies on sessions and on requests
- - Significantly change how hooks are dispatched - hooks now receive all the
- arguments specified by the user when making a request so hooks can make a
- secondary request with the same parameters. This is especially necessary for
- authentication handler authors
- - certifi support was removed
- - Fixed bug where using OAuth 1 with body ``signature_type`` sent no data
- - Major proxy work thanks to @Lukasa including parsing of proxy authentication
- from the proxy url
- - Fix DigestAuth handling too many 401s
- - Update vendored urllib3 to include SSL bug fixes
- - Allow keyword arguments to be passed to ``json.loads()`` via the
- ``Response.json()`` method
- - Don't send ``Content-Length`` header by default on ``GET`` or ``HEAD``
- requests
- - Add ``elapsed`` attribute to ``Response`` objects to time how long a request
- took.
- - Fix ``RequestsCookieJar``
- - Sessions and Adapters are now picklable, i.e., can be used with the
- multiprocessing library
- - Update charade to version 1.0.3
-
- The change in how hooks are dispatched will likely cause a great deal of
- issues.
-
- 1.1.0 (2013-01-10)
- ++++++++++++++++++
-
- - CHUNKED REQUESTS
- - Support for iterable response bodies
- - Assume servers persist redirect params
- - Allow explicit content types to be specified for file data
- - Make merge_kwargs case-insensitive when looking up keys
-
- 1.0.3 (2012-12-18)
- ++++++++++++++++++
-
- - Fix file upload encoding bug
- - Fix cookie behavior
-
- 1.0.2 (2012-12-17)
- ++++++++++++++++++
-
- - Proxy fix for HTTPAdapter.
-
- 1.0.1 (2012-12-17)
- ++++++++++++++++++
-
- - Cert verification exception bug.
- - Proxy fix for HTTPAdapter.
-
- 1.0.0 (2012-12-17)
- ++++++++++++++++++
-
- - Massive Refactor and Simplification
- - Switch to Apache 2.0 license
- - Swappable Connection Adapters
- - Mountable Connection Adapters
- - Mutable ProcessedRequest chain
- - /s/prefetch/stream
- - Removal of all configuration
- - Standard library logging
- - Make Response.json() callable, not property.
- - Usage of new charade project, which provides python 2 and 3 simultaneous chardet.
- - Removal of all hooks except 'response'
- - Removal of all authentication helpers (OAuth, Kerberos)
-
- This is not a backwards compatible change.
-
- 0.14.2 (2012-10-27)
- +++++++++++++++++++
-
- - Improved mime-compatible JSON handling
- - Proxy fixes
- - Path hack fixes
- - Case-Insensistive Content-Encoding headers
- - Support for CJK parameters in form posts
-
-
- 0.14.1 (2012-10-01)
- +++++++++++++++++++
-
- - Python 3.3 Compatibility
- - Simply default accept-encoding
- - Bugfixes
-
-
- 0.14.0 (2012-09-02)
- ++++++++++++++++++++
-
- - No more iter_content errors if already downloaded.
-
- 0.13.9 (2012-08-25)
- +++++++++++++++++++
-
- - Fix for OAuth + POSTs
- - Remove exception eating from dispatch_hook
- - General bugfixes
-
- 0.13.8 (2012-08-21)
- +++++++++++++++++++
-
- - Incredible Link header support :)
-
- 0.13.7 (2012-08-19)
- +++++++++++++++++++
-
- - Support for (key, value) lists everywhere.
- - Digest Authentication improvements.
- - Ensure proxy exclusions work properly.
- - Clearer UnicodeError exceptions.
- - Automatic casting of URLs to tsrings (fURL and such)
- - Bugfixes.
-
- 0.13.6 (2012-08-06)
- +++++++++++++++++++
-
- - Long awaited fix for hanging connections!
-
- 0.13.5 (2012-07-27)
- +++++++++++++++++++
-
- - Packaging fix
-
- 0.13.4 (2012-07-27)
- +++++++++++++++++++
-
- - GSSAPI/Kerberos authentication!
- - App Engine 2.7 Fixes!
- - Fix leaking connections (from urllib3 update)
- - OAuthlib path hack fix
- - OAuthlib URL parameters fix.
-
- 0.13.3 (2012-07-12)
- +++++++++++++++++++
-
- - Use simplejson if available.
- - Do not hide SSLErrors behind Timeouts.
- - Fixed param handling with urls containing fragments.
- - Significantly improved information in User Agent.
- - client certificates are ignored when verify=False
-
- 0.13.2 (2012-06-28)
- +++++++++++++++++++
-
- - Zero dependencies (once again)!
- - New: Response.reason
- - Sign querystring parameters in OAuth 1.0
- - Client certificates no longer ignored when verify=False
- - Add openSUSE certificate support
-
- 0.13.1 (2012-06-07)
- +++++++++++++++++++
-
- - Allow passing a file or file-like object as data.
- - Allow hooks to return responses that indicate errors.
- - Fix Response.text and Response.json for body-less responses.
-
- 0.13.0 (2012-05-29)
- +++++++++++++++++++
-
- - Removal of Requests.async in favor of `grequests `_
- - Allow disabling of cookie persistiance.
- - New implimentation of safe_mode
- - cookies.get now supports default argument
- - Session cookies not saved when Session.request is called with return_response=False
- - Env: no_proxy support.
- - RequestsCookieJar improvements.
- - Various bug fixes.
-
- 0.12.1 (2012-05-08)
- +++++++++++++++++++
-
- - New ``Response.json`` property.
- - Ability to add string file uploads.
- - Fix out-of-range issue with iter_lines.
- - Fix iter_content default size.
- - Fix POST redirects containing files.
-
- 0.12.0 (2012-05-02)
- +++++++++++++++++++
-
- - EXPERIMENTAL OAUTH SUPPORT!
- - Proper CookieJar-backed cookies interface with awesome dict-like interface.
- - Speed fix for non-iterated content chunks.
- - Move ``pre_request`` to a more usable place.
- - New ``pre_send`` hook.
- - Lazily encode data, params, files.
- - Load system Certificate Bundle if ``certify`` isn't available.
- - Cleanups, fixes.
-
- 0.11.2 (2012-04-22)
- +++++++++++++++++++
-
- - Attempt to use the OS's certificate bundle if ``certifi`` isn't available.
- - Infinite digest auth redirect fix.
- - Multi-part file upload improvements.
- - Fix decoding of invalid %encodings in URLs.
- - If there is no content in a response don't throw an error the second time that content is attempted to be read.
- - Upload data on redirects.
-
- 0.11.1 (2012-03-30)
- +++++++++++++++++++
-
- * POST redirects now break RFC to do what browsers do: Follow up with a GET.
- * New ``strict_mode`` configuration to disable new redirect behavior.
-
-
- 0.11.0 (2012-03-14)
- +++++++++++++++++++
-
- * Private SSL Certificate support
- * Remove select.poll from Gevent monkeypatching
- * Remove redundant generator for chunked transfer encoding
- * Fix: Response.ok raises Timeout Exception in safe_mode
-
- 0.10.8 (2012-03-09)
- +++++++++++++++++++
-
- * Generate chunked ValueError fix
- * Proxy configuration by environment variables
- * Simplification of iter_lines.
- * New `trust_env` configuration for disabling system/environment hints.
- * Suppress cookie errors.
-
- 0.10.7 (2012-03-07)
- +++++++++++++++++++
-
- * `encode_uri` = False
-
- 0.10.6 (2012-02-25)
- +++++++++++++++++++
-
- * Allow '=' in cookies.
-
- 0.10.5 (2012-02-25)
- +++++++++++++++++++
-
- * Response body with 0 content-length fix.
- * New async.imap.
- * Don't fail on netrc.
-
-
- 0.10.4 (2012-02-20)
- +++++++++++++++++++
-
- * Honor netrc.
-
- 0.10.3 (2012-02-20)
- +++++++++++++++++++
-
- * HEAD requests don't follow redirects anymore.
- * raise_for_status() doesn't raise for 3xx anymore.
- * Make Session objects picklable.
- * ValueError for invalid schema URLs.
-
- 0.10.2 (2012-01-15)
- +++++++++++++++++++
-
- * Vastly improved URL quoting.
- * Additional allowed cookie key values.
- * Attempted fix for "Too many open files" Error
- * Replace unicode errors on first pass, no need for second pass.
- * Append '/' to bare-domain urls before query insertion.
- * Exceptions now inherit from RuntimeError.
- * Binary uploads + auth fix.
- * Bugfixes.
-
-
- 0.10.1 (2012-01-23)
- +++++++++++++++++++
-
- * PYTHON 3 SUPPORT!
- * Dropped 2.5 Support. (*Backwards Incompatible*)
-
- 0.10.0 (2012-01-21)
- +++++++++++++++++++
-
- * ``Response.content`` is now bytes-only. (*Backwards Incompatible*)
- * New ``Response.text`` is unicode-only.
- * If no ``Response.encoding`` is specified and ``chardet`` is available, ``Respoonse.text`` will guess an encoding.
- * Default to ISO-8859-1 (Western) encoding for "text" subtypes.
- * Removal of `decode_unicode`. (*Backwards Incompatible*)
- * New multiple-hooks system.
- * New ``Response.register_hook`` for registering hooks within the pipeline.
- * ``Response.url`` is now Unicode.
-
- 0.9.3 (2012-01-18)
- ++++++++++++++++++
-
- * SSL verify=False bugfix (apparent on windows machines).
-
- 0.9.2 (2012-01-18)
- ++++++++++++++++++
-
- * Asynchronous async.send method.
- * Support for proper chunk streams with boundaries.
- * session argument for Session classes.
- * Print entire hook tracebacks, not just exception instance.
- * Fix response.iter_lines from pending next line.
- * Fix but in HTTP-digest auth w/ URI having query strings.
- * Fix in Event Hooks section.
- * Urllib3 update.
-
-
- 0.9.1 (2012-01-06)
- ++++++++++++++++++
-
- * danger_mode for automatic Response.raise_for_status()
- * Response.iter_lines refactor
-
- 0.9.0 (2011-12-28)
- ++++++++++++++++++
-
- * verify ssl is default.
-
-
- 0.8.9 (2011-12-28)
- ++++++++++++++++++
-
- * Packaging fix.
-
-
- 0.8.8 (2011-12-28)
- ++++++++++++++++++
-
- * SSL CERT VERIFICATION!
- * Release of Cerifi: Mozilla's cert list.
- * New 'verify' argument for SSL requests.
- * Urllib3 update.
-
- 0.8.7 (2011-12-24)
- ++++++++++++++++++
-
- * iter_lines last-line truncation fix
- * Force safe_mode for async requests
- * Handle safe_mode exceptions more consistently
- * Fix iteration on null responses in safe_mode
-
- 0.8.6 (2011-12-18)
- ++++++++++++++++++
-
- * Socket timeout fixes.
- * Proxy Authorization support.
-
- 0.8.5 (2011-12-14)
- ++++++++++++++++++
-
- * Response.iter_lines!
-
- 0.8.4 (2011-12-11)
- ++++++++++++++++++
-
- * Prefetch bugfix.
- * Added license to installed version.
-
- 0.8.3 (2011-11-27)
- ++++++++++++++++++
-
- * Converted auth system to use simpler callable objects.
- * New session parameter to API methods.
- * Display full URL while logging.
-
- 0.8.2 (2011-11-19)
- ++++++++++++++++++
-
- * New Unicode decoding system, based on over-ridable `Response.encoding`.
- * Proper URL slash-quote handling.
- * Cookies with ``[``, ``]``, and ``_`` allowed.
-
- 0.8.1 (2011-11-15)
- ++++++++++++++++++
-
- * URL Request path fix
- * Proxy fix.
- * Timeouts fix.
-
- 0.8.0 (2011-11-13)
- ++++++++++++++++++
-
- * Keep-alive support!
- * Complete removal of Urllib2
- * Complete removal of Poster
- * Complete removal of CookieJars
- * New ConnectionError raising
- * Safe_mode for error catching
- * prefetch parameter for request methods
- * OPTION method
- * Async pool size throttling
- * File uploads send real names
- * Vendored in urllib3
-
- 0.7.6 (2011-11-07)
- ++++++++++++++++++
-
- * Digest authentication bugfix (attach query data to path)
-
- 0.7.5 (2011-11-04)
- ++++++++++++++++++
-
- * Response.content = None if there was an invalid repsonse.
- * Redirection auth handling.
-
- 0.7.4 (2011-10-26)
- ++++++++++++++++++
-
- * Session Hooks fix.
-
- 0.7.3 (2011-10-23)
- ++++++++++++++++++
-
- * Digest Auth fix.
-
-
- 0.7.2 (2011-10-23)
- ++++++++++++++++++
-
- * PATCH Fix.
-
-
- 0.7.1 (2011-10-23)
- ++++++++++++++++++
-
- * Move away from urllib2 authentication handling.
- * Fully Remove AuthManager, AuthObject, &c.
- * New tuple-based auth system with handler callbacks.
-
-
- 0.7.0 (2011-10-22)
- ++++++++++++++++++
-
- * Sessions are now the primary interface.
- * Deprecated InvalidMethodException.
- * PATCH fix.
- * New config system (no more global settings).
-
-
- 0.6.6 (2011-10-19)
- ++++++++++++++++++
-
- * Session parameter bugfix (params merging).
-
-
- 0.6.5 (2011-10-18)
- ++++++++++++++++++
-
- * Offline (fast) test suite.
- * Session dictionary argument merging.
-
-
- 0.6.4 (2011-10-13)
- ++++++++++++++++++
-
- * Automatic decoding of unicode, based on HTTP Headers.
- * New ``decode_unicode`` setting.
- * Removal of ``r.read/close`` methods.
- * New ``r.faw`` interface for advanced response usage.*
- * Automatic expansion of parameterized headers.
-
-
- 0.6.3 (2011-10-13)
- ++++++++++++++++++
-
- * Beautiful ``requests.async`` module, for making async requests w/ gevent.
-
-
- 0.6.2 (2011-10-09)
- ++++++++++++++++++
-
- * GET/HEAD obeys allow_redirects=False.
-
-
- 0.6.1 (2011-08-20)
- ++++++++++++++++++
-
- * Enhanced status codes experience ``\o/``
- * Set a maximum number of redirects (``settings.max_redirects``)
- * Full Unicode URL support
- * Support for protocol-less redirects.
- * Allow for arbitrary request types.
- * Bugfixes
-
-
- 0.6.0 (2011-08-17)
- ++++++++++++++++++
-
- * New callback hook system
- * New persistient sessions object and context manager
- * Transparent Dict-cookie handling
- * Status code reference object
- * Removed Response.cached
- * Added Response.request
- * All args are kwargs
- * Relative redirect support
- * HTTPError handling improvements
- * Improved https testing
- * Bugfixes
-
-
- 0.5.1 (2011-07-23)
- ++++++++++++++++++
-
- * International Domain Name Support!
- * Access headers without fetching entire body (``read()``)
- * Use lists as dicts for parameters
- * Add Forced Basic Authentication
- * Forced Basic is default authentication type
- * ``python-requests.org`` default User-Agent header
- * CaseInsensitiveDict lower-case caching
- * Response.history bugfix
-
-
- 0.5.0 (2011-06-21)
- ++++++++++++++++++
-
- * PATCH Support
- * Support for Proxies
- * HTTPBin Test Suite
- * Redirect Fixes
- * settings.verbose stream writing
- * Querystrings for all methods
- * URLErrors (Connection Refused, Timeout, Invalid URLs) are treated as explicity raised
- ``r.requests.get('hwe://blah'); r.raise_for_status()``
-
-
- 0.4.1 (2011-05-22)
- ++++++++++++++++++
-
- * Improved Redirection Handling
- * New 'allow_redirects' param for following non-GET/HEAD Redirects
- * Settings module refactoring
-
-
- 0.4.0 (2011-05-15)
- ++++++++++++++++++
-
- * Response.history: list of redirected responses
- * Case-Insensitive Header Dictionaries!
- * Unicode URLs
-
-
- 0.3.4 (2011-05-14)
- ++++++++++++++++++
-
- * Urllib2 HTTPAuthentication Recursion fix (Basic/Digest)
- * Internal Refactor
- * Bytes data upload Bugfix
-
-
-
- 0.3.3 (2011-05-12)
- ++++++++++++++++++
-
- * Request timeouts
- * Unicode url-encoded data
- * Settings context manager and module
-
-
- 0.3.2 (2011-04-15)
- ++++++++++++++++++
-
- * Automatic Decompression of GZip Encoded Content
- * AutoAuth Support for Tupled HTTP Auth
-
-
- 0.3.1 (2011-04-01)
- ++++++++++++++++++
-
- * Cookie Changes
- * Response.read()
- * Poster fix
-
-
- 0.3.0 (2011-02-25)
- ++++++++++++++++++
-
- * Automatic Authentication API Change
- * Smarter Query URL Parameterization
- * Allow file uploads and POST data together
- * New Authentication Manager System
- - Simpler Basic HTTP System
- - Supports all build-in urllib2 Auths
- - Allows for custom Auth Handlers
-
-
- 0.2.4 (2011-02-19)
- ++++++++++++++++++
-
- * Python 2.5 Support
- * PyPy-c v1.4 Support
- * Auto-Authentication tests
- * Improved Request object constructor
-
- 0.2.3 (2011-02-15)
- ++++++++++++++++++
-
- * New HTTPHandling Methods
- - Response.__nonzero__ (false if bad HTTP Status)
- - Response.ok (True if expected HTTP Status)
- - Response.error (Logged HTTPError if bad HTTP Status)
- - Response.raise_for_status() (Raises stored HTTPError)
-
-
- 0.2.2 (2011-02-14)
- ++++++++++++++++++
-
- * Still handles request in the event of an HTTPError. (Issue #2)
- * Eventlet and Gevent Monkeypatch support.
- * Cookie Support (Issue #1)
-
-
- 0.2.1 (2011-02-14)
- ++++++++++++++++++
-
- * Added file attribute to POST and PUT requests for multipart-encode file uploads.
- * Added Request.url attribute for context and redirects
-
-
- 0.2.0 (2011-02-14)
- ++++++++++++++++++
-
- * Birth!
-
-
- 0.0.1 (2011-02-13)
- ++++++++++++++++++
-
- * Frustration
- * Conception
-
-
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: Natural Language :: English
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
diff --git a/PythonHome/thirdparty/requests-2.2.1.dist-info/pydist.json b/PythonHome/thirdparty/requests-2.2.1.dist-info/pydist.json
deleted file mode 100644
index fcb287499..000000000
--- a/PythonHome/thirdparty/requests-2.2.1.dist-info/pydist.json
+++ /dev/null
@@ -1 +0,0 @@
-{"license": "Copyright 2014 Kenneth Reitz", "document_names": {"description": "DESCRIPTION.rst"}, "name": "requests", "metadata_version": "2.0", "contacts": [{"role": "author", "email": "me@kennethreitz.com", "name": "Kenneth Reitz"}], "generator": "bdist_wheel (0.22.0)", "summary": "Python HTTP for Humans.", "project_urls": {"Home": "http://python-requests.org"}, "version": "2.2.1"}
\ No newline at end of file
diff --git a/PythonHome/thirdparty/wox.py b/PythonHome/wox.py
similarity index 95%
rename from PythonHome/thirdparty/wox.py
rename to PythonHome/wox.py
index 503bfa4f1..6cf05527e 100644
--- a/PythonHome/thirdparty/wox.py
+++ b/PythonHome/wox.py
@@ -1,4 +1,5 @@
#encoding=utf8
+
import json
import sys
import inspect
@@ -36,7 +37,7 @@ class Wox(object):
class WoxAPI(object):
@classmethod
- def wox_change_query(cls,query,requery = False):
+ def change_query(cls,query,requery = False):
"""
change wox query
"""
diff --git a/Wox/JsonRPC/JsonPRCModel.cs b/Wox/JsonRPC/JsonPRCModel.cs
index 7c39275ea..84ecc3518 100644
--- a/Wox/JsonRPC/JsonPRCModel.cs
+++ b/Wox/JsonRPC/JsonPRCModel.cs
@@ -45,7 +45,7 @@ namespace Wox.JsonRPC
public new List Result { get; set; }
}
- public abstract class JsonRPCRequestModel : JsonRPCModelBase
+ public class JsonRPCRequestModel : JsonRPCModelBase
{
public string Method { get; set; }
@@ -108,11 +108,17 @@ namespace Wox.JsonRPC
}
///
- /// Json RPC Request that client sent to Wox
+ /// Json RPC Request(in query response) that client sent to Wox
///
public class JsonRPCClientRequestModel : JsonRPCRequestModel
{
public bool DontHideAfterAction { get; set; }
+
+ public override string ToString()
+ {
+ string rpc = base.ToString();
+ return rpc + "}";
+ }
}
///
diff --git a/Wox/PluginLoader/BasePlugin.cs b/Wox/PluginLoader/BasePlugin.cs
index f74cd497e..ce800061c 100644
--- a/Wox/PluginLoader/BasePlugin.cs
+++ b/Wox/PluginLoader/BasePlugin.cs
@@ -35,6 +35,8 @@ namespace Wox.PluginLoader
List results = new List();
JsonRPCQueryResponseModel queryResponseModel = JsonConvert.DeserializeObject(output);
+ if (queryResponseModel.Result == null) return null;
+
foreach (JsonRPCResult result in queryResponseModel.Result)
{
JsonRPCResult result1 = result;
@@ -53,7 +55,7 @@ namespace Wox.PluginLoader
string actionReponse = ExecuteAction(result1.JsonRPCAction);
JsonRPCRequestModel jsonRpcRequestModel = JsonConvert.DeserializeObject(actionReponse);
if (jsonRpcRequestModel != null
- && string.IsNullOrEmpty(jsonRpcRequestModel.Method)
+ && !string.IsNullOrEmpty(jsonRpcRequestModel.Method)
&& jsonRpcRequestModel.Method.StartsWith("Wox."))
{
ExecuteWoxAPI(jsonRpcRequestModel.Method.Substring(4), jsonRpcRequestModel.Parameters);
diff --git a/Wox/PluginLoader/PythonPlugin.cs b/Wox/PluginLoader/PythonPlugin.cs
index eb95f6c40..8a00c7a65 100644
--- a/Wox/PluginLoader/PythonPlugin.cs
+++ b/Wox/PluginLoader/PythonPlugin.cs
@@ -28,7 +28,7 @@ namespace Wox.PluginLoader
};
string additionalPythonPath = string.Format("{0};{1}",
Path.Combine(woxDirectory, "PythonHome\\DLLs"),
- Path.Combine(woxDirectory, "PythonHome\\thirdparty"));
+ Path.Combine(woxDirectory, "PythonHome\\Lib\\site-packages"));
if (!startInfo.EnvironmentVariables.ContainsKey("PYTHONPATH"))
{