Skip to content

Commit

Permalink
Update vendored dependencies
Browse files Browse the repository at this point in the history
- Update shellingham, tomlkit, requests, urllib3, certifi, vistir and
  parse
- Fixes #2820
- Fixes #2852

Signed-off-by: Dan Ryan <dan@danryan.co>
  • Loading branch information
techalchemy committed Oct 20, 2018
1 parent 47540c2 commit 7147a09
Show file tree
Hide file tree
Showing 50 changed files with 455 additions and 557 deletions.
2 changes: 1 addition & 1 deletion pipenv/vendor/certifi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from .core import where, old_where

__version__ = "2018.08.24"
__version__ = "2018.10.15"
30 changes: 0 additions & 30 deletions pipenv/vendor/certifi/cacert.pem
Original file line number Diff line number Diff line change
Expand Up @@ -326,36 +326,6 @@ OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
-----END CERTIFICATE-----

# Issuer: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
# Subject: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
# Label: "Visa eCommerce Root"
# Serial: 25952180776285836048024890241505565794
# MD5 Fingerprint: fc:11:b8:d8:08:93:30:00:6d:23:f9:7e:eb:52:1e:02
# SHA1 Fingerprint: 70:17:9b:86:8c:00:a4:fa:60:91:52:22:3f:9f:3e:32:bd:e0:05:62
# SHA256 Fingerprint: 69:fa:c9:bd:55:fb:0a:c7:8d:53:bb:ee:5c:f1:d5:97:98:9f:d0:aa:ab:20:a2:51:51:bd:f1:73:3e:e7:d1:22
-----BEGIN CERTIFICATE-----
MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr
MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl
cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw
CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h
dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l
cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h
2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E
lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV
ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq
299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t
vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL
dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF
AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR
zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3
LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd
7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw
++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
398znM/jra6O1I7mT1GvFpLgXPYHDw==
-----END CERTIFICATE-----

# Issuer: CN=AAA Certificate Services O=Comodo CA Limited
# Subject: CN=AAA Certificate Services O=Comodo CA Limited
# Label: "Comodo AAA Services root"
Expand Down
33 changes: 29 additions & 4 deletions pipenv/vendor/parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,19 @@
Note that the "center" alignment does not test to make sure the value is
centered - it just strips leading and trailing whitespace.
Width and precision may be used to restrict the size of matched text
from the input. Width specifies a minimum size and precision specifies
a maximum. For example:
>>> parse('{:.2}{:.2}', 'look') # specifying precision
<Result ('lo', 'ok') {}>
>>> parse('{:4}{:4}', 'look at that') # specifying width
<Result ('look', 'at that') {}>
>>> parse('{:4}{:.4}', 'look at that') # specifying both
<Result ('look at ', 'that') {}>
>>> parse('{:2d}{:2d}', '0440') # parsing two contiguous numbers
<Result (4, 40) {}>
Some notes for the date and time types:
- the presence of the time part is optional (including ISO 8601, starting
Expand Down Expand Up @@ -329,6 +342,9 @@
**Version history (in brief)**:
- 1.9.0 We now honor precision and width specifiers when parsing numbers
and strings, allowing parsing of concatenated elements of fixed width
(thanks Julia Signell)
- 1.8.4 Add LICENSE file at request of packagers.
Correct handling of AM/PM to follow most common interpretation.
Correct parsing of hexadecimal that looks like a binary prefix.
Expand Down Expand Up @@ -389,7 +405,7 @@
'''

from __future__ import absolute_import
__version__ = '1.8.4'
__version__ = '1.9.0'

# yes, I now have two problems
import re
Expand Down Expand Up @@ -977,7 +993,11 @@ def f(string, m):
self._group_index += 2
self._type_conversions[group] = lambda s, m: float(s)
elif type == 'd':
s = r'\d+|0[xX][0-9a-fA-F]+|0[bB][01]+|0[oO][0-7]+'
if format.get('width'):
width = '{1,%s}' % int(format['width'])
else:
width = '+'
s = '\\d{w}|0[xX][0-9a-fA-F]{w}|0[bB][01]{w}|0[oO][0-7]{w}'.format(w=width)
self._type_conversions[group] = int_convert(10)
elif type == 'ti':
s = r'(\d{4}-\d\d-\d\d)((\s+|T)%s)?(Z|\s*[-+]\d\d:?\d\d)?' % \
Expand Down Expand Up @@ -1038,6 +1058,13 @@ def f(string, m):

elif type:
s = r'\%s+' % type
elif format.get('precision'):
if format.get('width'):
s = '.{%s,%s}?' % (format['width'], format['precision'])
else:
s = '.{1,%s}?' % format['precision']
elif format.get('width'):
s = '.{%s,}?' % format['width']
else:
s = '.+?'

Expand All @@ -1053,8 +1080,6 @@ def f(string, m):
if not fill:
fill = '0'
s = '%s*' % fill + s
elif format['zero']:
s = '0*' + s

# allow numbers to be prefixed with a sign
s = r'[-+ ]?' + s
Expand Down
2 changes: 1 addition & 1 deletion pipenv/vendor/shellingham/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from ._core import ShellDetectionFailure


__version__ = '1.2.6'
__version__ = '1.2.7'


def detect_shell(pid=None, max_depth=6):
Expand Down
12 changes: 9 additions & 3 deletions pipenv/vendor/shellingham/posix/ps.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,22 @@ def get_process_mapping():
if e.errno != errno.ENOENT:
raise
raise PsNotAvailable('ps not found')
except subprocess.CalledProcessError as e:
# `ps` can return 1 if the process list is completely empty.
# (sarugaku/shellingham#15)
if not e.output.strip():
return {}
raise
if not isinstance(output, str):
encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
output = output.decode(encoding)
processes = {}
for line in output.split('\n'):
try:
pid, ppid, args = line.strip().split(None, 2)
processes[pid] = Process(
args=tuple(shlex.split(args)), pid=pid, ppid=ppid,
)
except ValueError:
continue
processes[pid] = Process(
args=tuple(shlex.split(args)), pid=pid, ppid=ppid,
)
return processes
2 changes: 1 addition & 1 deletion pipenv/vendor/tomlkit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
from .api import ws


__version__ = "0.4.4"
__version__ = "0.4.6"
19 changes: 18 additions & 1 deletion pipenv/vendor/tomlkit/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from .exceptions import KeyAlreadyPresent
from .exceptions import NonExistentKey
from .items import AoT
from .items import Bool
from .items import Comment
from .items import Item
from .items import Key
Expand Down Expand Up @@ -525,3 +524,21 @@ def __eq__(self, other): # type: (Dict) -> bool
return NotImplemented

return self.value == other

def _getstate(self, protocol):
return (self._parsed,)

def __reduce__(self):
return self.__reduce_ex__(2)

def __reduce_ex__(self, protocol):
return (
self.__class__,
self._getstate(protocol),
(self._map, self._body, self._parsed),
)

def __setstate__(self, state):
self._map = state[0]
self._body = state[1]
self._parsed = state[2]
2 changes: 1 addition & 1 deletion pipenv/vendor/tomlkit/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class InvalidCharInStringError(ParseError):
"""

def __init__(self, line, col, char): # type: (int, int, str) -> None
message = "Invalid character '{}' in string".format(char)
message = "Invalid character {} in string".format(repr(char))

super(InvalidCharInStringError, self).__init__(line, col, message=message)

Expand Down
Loading

0 comments on commit 7147a09

Please sign in to comment.