Whitespace cleanup; now passes the regression test (the last checkin made
it fail on a TabError (inconsistent tab/space usage)).
Removed a comment about including a test since there is a regression test
for this module.
diff --git a/Lib/Cookie.py b/Lib/Cookie.py
index 956a909..67259af 100644
--- a/Lib/Cookie.py
+++ b/Lib/Cookie.py
@@ -309,7 +309,7 @@
}
def _quote(str, LegalChars=_LegalChars,
- join=string.join, idmap=string._idmap, translate=string.translate):
+ join=string.join, idmap=string._idmap, translate=string.translate):
#
# If the string does not need to be double-quoted,
# then just return the string. Otherwise, surround
@@ -317,9 +317,9 @@
# special characters.
#
if "" == translate(str, idmap, LegalChars):
- return str
+ return str
else:
- return '"' + join( map(_Translator.get, str, str), "" ) + '"'
+ return '"' + join( map(_Translator.get, str, str), "" ) + '"'
# end _quote
@@ -339,7 +339,7 @@
# Remove the "s
str = str[1:-1]
-
+
# Check for special sequences. Examples:
# \012 --> \n
# \" --> "
@@ -421,7 +421,7 @@
"version" : "Version",
}
_reserved_keys = _reserved.keys()
-
+
def __init__(self):
# Set defaults
self.key = self.value = self.coded_value = None
@@ -440,7 +440,7 @@
# end __setitem__
def isReservedKey(self, K):
- return string.lower(K) in self._reserved_keys
+ return string.lower(K) in self._reserved_keys
# end isReservedKey
def set(self, key, val, coded_val,
@@ -467,7 +467,7 @@
def __repr__(self):
return '<%s: %s=%s>' % (self.__class__.__name__,
self.key, repr(self.value) )
-
+
def js_output(self, attrs=None):
# Print javascript
return """
@@ -484,7 +484,7 @@
#
result = []
RA = result.append
-
+
# First, the key=value pair
RA("%s=%s;" % (self.key, self.coded_value))
@@ -502,7 +502,7 @@
RA("%s;" % self._reserved[K])
else:
RA("%s=%s;" % (self._reserved[K], V))
-
+
# Return the result
return string.join(result, " ")
# end OutputString
@@ -542,7 +542,7 @@
class BaseCookie(UserDict):
# A container class for a set of Morsels
#
-
+
def value_decode(self, val):
"""real_value, coded_value = value_decode(STRING)
Called prior to setting a cookie's value from the network
@@ -562,7 +562,7 @@
strval = str(val)
return strval, strval
# end value_encode
-
+
def __init__(self, input=None):
UserDict.__init__(self)
if input: self.load(input)
@@ -596,7 +596,7 @@
for K,V in self.items():
L.append( '%s=%s' % (K,repr(V.value) ) )
return '<%s: %s>' % (self.__class__.__name__, string.join(L))
-
+
def js_output(self, attrs=None):
"""Return a string suitable for JavaScript."""
result = []
@@ -617,7 +617,7 @@
self.update(rawdata)
return
# end load()
-
+
def __ParseString(self, str, patt=_CookiePattern):
i = 0 # Our starting point
n = len(str) # Length of string
@@ -645,8 +645,6 @@
rval, cval = self.value_decode(V)
self.__set(K, rval, cval)
M = self[K]
-
- return
# end __ParseString
# end BaseCookie class
@@ -674,7 +672,7 @@
Note: Large cookie values add overhead because they must be
retransmitted on every HTTP transaction.
-
+
Note: HTTP has a 2k limit on the size of a cookie. This class
does not check for this limit, so be careful!!!
"""
@@ -694,7 +692,7 @@
Note: Large cookie values add overhead because they must be
retransmitted on every HTTP transaction.
-
+
Note: HTTP has a 2k limit on the size of a cookie. This class
does not check for this limit, so be careful!!!
"""
@@ -723,10 +721,6 @@
-#
-# should add a test routine?
-#
-
#Local Variables:
#tab-width: 4
#end: