merge from headtests.pycon2011

1 files changed, 14 insertions, 7 deletions

diff --git a/webob/multidict.py b/webob/multidict.py
index b32bc5a..e9d3914 100644
--- a/webob/multidict.py
+++ b/webob/multidict.py
@@ -3,9 +3,12 @@
 """
 Gives a multi-value dictionary object (MultiDict) plus several wrappers
 """
-import cgi, copy, sys, warnings, urllib
-from UserDict import DictMixin
 
+import cgi
+import copy
+import sys
+import warnings
+from UserDict import DictMixin
 
 
 __all__ = ['MultiDict', 'UnicodeMultiDict', 'NestedMultiDict', 'NoVars',
@@ -20,7 +23,8 @@ class MultiDict(DictMixin):
 
     def __init__(self, *args, **kw):
         if len(args) > 1:
-            raise TypeError("MultiDict can only be called with one positional argument")
+            raise TypeError(
+                "MultiDict can only be called with one positional argument")
         if args:
             if hasattr(args[0], 'iteritems'):
                 items = list(args[0].iteritems())
@@ -186,8 +190,8 @@ class MultiDict(DictMixin):
         if args:
             lst = args[0]
             if len(lst) != len(dict(lst)):
-                # this does not catch the cases where we overwrite existing keys,
-                # but those would produce too many warning
+                # this does not catch the cases where we overwrite existing
+                # keys, but those would produce too many warning
                 msg = ("Behavior of MultiDict.update() has changed "
                     "and overwrites duplicate keys. Consider using .extend()"
                 )
@@ -326,7 +330,8 @@ class UnicodeMultiDict(DictMixin):
         """
         Return a list of all values matching the key (may be an empty list)
         """
-        return [self._decode_value(v) for v in self.multi.getall(self._encode_key(key))]
+        return [self._decode_value(v) for v in
+                self.multi.getall(self._encode_key(key))]
 
     def getone(self, key):
         """
@@ -378,7 +383,9 @@ class UnicodeMultiDict(DictMixin):
         return UnicodeMultiDict(self.multi.copy(), self.encoding, self.errors)
 
     def setdefault(self, key, default=None):
-        return self._decode_value(self.multi.setdefault(self._encode_key(key), self._encode_value(default)))
+        return self._decode_value(
+            self.multi.setdefault(self._encode_key(key),
+                                  self._encode_value(default)))
 
     def pop(self, key, *args):
         return self._decode_value(self.multi.pop(self._encode_key(key), *args))