diff options
Diffstat (limited to 'Lib/http')
| -rw-r--r-- | Lib/http/cookiejar.py | 22 | ||||
| -rw-r--r-- | Lib/http/cookies.py | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py index afd5f20..e9efab8 100644 --- a/Lib/http/cookiejar.py +++ b/Lib/http/cookiejar.py @@ -121,7 +121,7 @@ def time2netscape(t=None): UTC_ZONES = {"GMT": None, "UTC": None, "UT": None, "Z": None} -TIMEZONE_RE = re.compile(r"^([-+])?(\d\d?):?(\d\d)?$") +TIMEZONE_RE = re.compile(r"^([-+])?(\d\d?):?(\d\d)?$", re.ASCII) def offset_from_tz_string(tz): offset = None if tz in UTC_ZONES: @@ -191,9 +191,9 @@ def _str2time(day, mon, yr, hr, min, sec, tz): STRICT_DATE_RE = re.compile( r"^[SMTWF][a-z][a-z], (\d\d) ([JFMASOND][a-z][a-z]) " - "(\d\d\d\d) (\d\d):(\d\d):(\d\d) GMT$") + "(\d\d\d\d) (\d\d):(\d\d):(\d\d) GMT$", re.ASCII) WEEKDAY_RE = re.compile( - r"^(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)[a-z]*,?\s*", re.I) + r"^(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)[a-z]*,?\s*", re.I | re.ASCII) LOOSE_HTTP_DATE_RE = re.compile( r"""^ (\d\d?) # day @@ -210,7 +210,7 @@ LOOSE_HTTP_DATE_RE = re.compile( ([-+]?\d{2,4}|(?![APap][Mm]\b)[A-Za-z]+)? # timezone \s* (?:\(\w+\))? # ASCII representation of timezone in parens. - \s*$""", re.X) + \s*$""", re.X | re.ASCII) def http2time(text): """Returns time in seconds since epoch of time represented by a string. @@ -282,7 +282,7 @@ ISO_DATE_RE = re.compile( \s* ([-+]?\d\d?:?(:?\d\d)? |Z|z)? # timezone (Z is "zero meridian", i.e. GMT) - \s*$""", re.X) + \s*$""", re.X | re. ASCII) def iso2time(text): """ As for http2time, but parses the ISO 8601 formats: @@ -489,7 +489,7 @@ def parse_ns_headers(ns_headers): return result -IPV4_RE = re.compile(r"\.\d+$") +IPV4_RE = re.compile(r"\.\d+$", re.ASCII) def is_HDN(text): """Return True if text is a host domain name.""" # XXX @@ -574,7 +574,7 @@ def user_domain_match(A, B): return True return False -cut_port_re = re.compile(r":\d+$") +cut_port_re = re.compile(r":\d+$", re.ASCII) def request_host(request): """Return request-host, as defined by RFC 2965. @@ -1207,7 +1207,7 @@ class CookieJar: domain_re = re.compile(r"[^.]*") dots_re = re.compile(r"^\.+") - magic_re = r"^\#LWP-Cookies-(\d+\.\d+)" + magic_re = re.compile(r"^\#LWP-Cookies-(\d+\.\d+)", re.ASCII) def __init__(self, policy=None): if policy is None: @@ -1856,7 +1856,7 @@ class LWPCookieJar(FileCookieJar): def _really_load(self, f, filename, ignore_discard, ignore_expires): magic = f.readline() - if not re.search(self.magic_re, magic): + if not self.magic_re.search(magic): msg = ("%r does not look like a Set-Cookie3 (LWP) format " "file" % filename) raise LoadError(msg) @@ -1965,7 +1965,7 @@ class MozillaCookieJar(FileCookieJar): header by default (Mozilla can cope with that). """ - magic_re = "#( Netscape)? HTTP Cookie File" + magic_re = re.compile("#( Netscape)? HTTP Cookie File") header = """\ # Netscape HTTP Cookie File # http://www.netscape.com/newsref/std/cookie_spec.html @@ -1977,7 +1977,7 @@ class MozillaCookieJar(FileCookieJar): now = time.time() magic = f.readline() - if not re.search(self.magic_re, magic): + if not self.magic_re.search(magic): f.close() raise LoadError( "%r does not look like a Netscape format cookies file" % diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py index 344bede..3242d83 100644 --- a/Lib/http/cookies.py +++ b/Lib/http/cookies.py @@ -445,7 +445,7 @@ _CookiePattern = re.compile( ""+ _LegalCharsPatt +"*" # Any word or empty string r")" # End of group 'val' r"\s*;?" # Probably ending in a semi-colon - ) + , re.ASCII) # May be removed if safe. # At long last, here is the cookie class. |