Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boto/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ def connect_machinelearning(aws_access_key_id=None,
def storage_uri(uri_str, default_scheme='file', debug=0, validate=True,
bucket_storage_uri_class=BucketStorageUri,
suppress_consec_slashes=True, is_latest=False):
"""
r"""
Instantiate a StorageUri from a URI string.

:type uri_str: string
Expand Down
8 changes: 4 additions & 4 deletions boto/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -668,10 +668,10 @@ def handle_proxy(self, proxy, proxy_port, proxy_user, proxy_pass):
self.proxy_pass = proxy_pass
if 'http_proxy' in os.environ and not self.proxy:
pattern = re.compile(
'(?:http://)?'
'(?:(?P<user>[\w\-\.]+):(?P<pass>.*)@)?'
'(?P<host>[\w\-\.]+)'
'(?::(?P<port>\d+))?'
r'(?:http://)?'
r'(?:(?P<user>[\w\-\.]+):(?P<pass>.*)@)?'
r'(?P<host>[\w\-\.]+)'
r'(?::(?P<port>\d+))?'
)
match = pattern.match(os.environ['http_proxy'])
if match:
Expand Down
2 changes: 1 addition & 1 deletion boto/https_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def ValidateCertificateHostname(cert, hostname):
"validating server certificate: hostname=%s, certificate hosts=%s",
hostname, hosts)
for host in hosts:
host_re = host.replace('.', '\.').replace('*', '[^.]*')
host_re = host.replace('.', r'\.').replace('*', '[^.]*')
if re.search('^%s$' % (host_re,), hostname, re.I):
return True
return False
Expand Down
2 changes: 1 addition & 1 deletion boto/pyami/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def load_credential_file(self, path):
def load_from_path(self, path):
file = open(path)
for line in file.readlines():
match = re.match("^#import[\s\t]*([^\s^\t]*)[\s\t]*$", line)
match = re.match(r"^#import[\s\t]*([^\s^\t]*)[\s\t]*$", line)
if match:
extended_file = match.group(1)
(dir, file) = os.path.split(path)
Expand Down