equal
deleted
inserted
replaced
16 +is_solaris = ('sunos' in str(sys.platform).lower()) |
16 +is_solaris = ('sunos' in str(sys.platform).lower()) |
17 |
17 |
18 try: |
18 try: |
19 import simplejson as json |
19 import simplejson as json |
20 --- requests-1.2.3/requests/certs.py.orig 2013-07-31 07:34:29.859095710 -0700 |
20 --- requests-1.2.3/requests/certs.py.orig 2013-07-31 07:34:29.859095710 -0700 |
21 +++ requests-1.2.3/requests/certs.py 2013-07-31 09:31:36.868103751 -0700 |
21 +++ requests-1.2.3/requests/certs.py 2014-04-17 08:51:04.868103751 -0700 |
22 @@ -13,12 +13,15 @@ |
22 @@ -13,12 +13,15 @@ |
23 """ |
23 """ |
24 |
24 |
25 import os.path |
25 import os.path |
26 - |
26 - |
27 +import compat |
27 +from requests import compat |
28 |
28 |
29 def where(): |
29 def where(): |
30 """Return the preferred certificate bundle.""" |
30 """Return the preferred certificate bundle.""" |
31 # vendored bundle inside Requests |
31 # vendored bundle inside Requests |
32 - return os.path.join(os.path.dirname(__file__), 'cacert.pem') |
32 - return os.path.join(os.path.dirname(__file__), 'cacert.pem') |