diff options
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/http/response.py | 9 | ||||
| -rw-r--r-- | netlib/multidict.py | 8 | ||||
| -rw-r--r-- | netlib/odict.py | 170 |
3 files changed, 13 insertions, 174 deletions
diff --git a/netlib/http/response.py b/netlib/http/response.py index 7dabfcab..17d69418 100644 --- a/netlib/http/response.py +++ b/netlib/http/response.py @@ -73,10 +73,11 @@ class Response(message.Message): def cookies(self): # type: () -> multidict.MultiDictView """ - The response cookies. A possibly empty :py:class:`~netlib.multidict.MultiDictView`, where the keys are - cookie name strings, and values are (value, attr) tuples. Value is a string, and attr is - an ODictCaseless containing cookie attributes. Within attrs, unary attributes (e.g. HTTPOnly) - are indicated by a Null value. + The response cookies. A possibly empty + :py:class:`~netlib.multidict.MultiDictView`, where the keys are cookie + name strings, and values are (value, attr) tuples. Value is a string, + and attr is an MultiDictView containing cookie attributes. Within + attrs, unary attributes (e.g. HTTPOnly) are indicated by a Null value. Caveats: Updating the attr diff --git a/netlib/multidict.py b/netlib/multidict.py index 982a1178..50c879d9 100644 --- a/netlib/multidict.py +++ b/netlib/multidict.py @@ -235,6 +235,14 @@ class MultiDict(_MultiDict): tuple(i) for i in fields ) + @staticmethod + def _reduce_values(values): + return values[0] + + @staticmethod + def _kconv(key): + return key + @six.add_metaclass(ABCMeta) class ImmutableMultiDict(MultiDict): diff --git a/netlib/odict.py b/netlib/odict.py deleted file mode 100644 index f9f55991..00000000 --- a/netlib/odict.py +++ /dev/null @@ -1,170 +0,0 @@ -from __future__ import (absolute_import, print_function, division) -import copy - -import six - -from netlib import basetypes, strutils - - -class ODict(basetypes.Serializable): - - """ - A dictionary-like object for managing ordered (key, value) data. Think - about it as a convenient interface to a list of (key, value) tuples. - """ - - def __init__(self, lst=None): - self.lst = lst or [] - - def _kconv(self, s): - return s - - def __eq__(self, other): - return self.lst == other.lst - - def __ne__(self, other): - return not self.__eq__(other) - - def __iter__(self): - return self.lst.__iter__() - - def __getitem__(self, key): - """ - Returns a list of values matching key. - """ - - key = self._kconv(key) - return [ - v - for k, v in self.lst - if self._kconv(k) == key - ] - - def keys(self): - return list( - set( - self._kconv(k) for k, _ in self.lst - ) - ) - - def __len__(self): - """ - Total number of (key, value) pairs. - """ - return len(self.lst) - - def __setitem__(self, k, valuelist): - """ - Sets the values for key k. If there are existing values for this - key, they are cleared. - """ - if isinstance(valuelist, six.text_type) or isinstance(valuelist, six.binary_type): - raise ValueError( - "Expected list of values instead of string. " - "Example: odict[b'Host'] = [b'www.example.com']" - ) - kc = self._kconv(k) - new = [] - for i in self.lst: - if self._kconv(i[0]) == kc: - if valuelist: - new.append([k, valuelist.pop(0)]) - else: - new.append(i) - while valuelist: - new.append([k, valuelist.pop(0)]) - self.lst = new - - def __delitem__(self, k): - """ - Delete all items matching k. - """ - k = self._kconv(k) - self.lst = [ - i - for i in self.lst - if self._kconv(i[0]) != k - ] - - def __contains__(self, key): - key = self._kconv(key) - return any( - self._kconv(k) == key - for k, _ in self.lst - ) - - def add(self, key, value, prepend=False): - if prepend: - self.lst.insert(0, [key, value]) - else: - self.lst.append([key, value]) - - def get(self, k, d=None): - if k in self: - return self[k] - else: - return d - - def get_first(self, k, d=None): - if k in self: - return self[k][0] - else: - return d - - def items(self): - return self.lst[:] - - def copy(self): - """ - Returns a copy of this object. - """ - lst = copy.deepcopy(self.lst) - return self.__class__(lst) - - def extend(self, other): - """ - Add the contents of other, preserving any duplicates. - """ - self.lst.extend(other.lst) - - def __repr__(self): - return repr(self.lst) - - def replace(self, pattern, repl, *args, **kwargs): - """ - Replaces a regular expression pattern with repl in both keys and - values. - - Returns the number of replacements made. - """ - new, count = [], 0 - for k, v in self.lst: - k, c = strutils.safe_subn(pattern, repl, k, *args, **kwargs) - count += c - v, c = strutils.safe_subn(pattern, repl, v, *args, **kwargs) - count += c - new.append([k, v]) - self.lst = new - return count - - # Implement Serializable - def get_state(self): - return [tuple(i) for i in self.lst] - - def set_state(self, state): - self.lst = [list(i) for i in state] - - @classmethod - def from_state(cls, state): - return cls([list(i) for i in state]) - - -class ODictCaseless(ODict): - - """ - A variant of ODict with "caseless" keys. This version _preserves_ key - case, but does not consider case when setting or getting items. - """ - - def _kconv(self, s): - return s.lower() |