Merge branch 'master' into python3

[wrw.git] / wrw / form.py

diff --git a/wrw/form.py b/wrw/form.py
index 1f0e530..d089fd7 100644 (file)
--- a/wrw/form.py
+++ b/wrw/form.py
@@ -1,5 +1,5 @@
 import cgi
-import proto
+from . import proto
 
 __all__ = ["formdata"]
 
@@ -32,7 +32,7 @@ class formwrap(object):
         return list(iter())
 
     def keys(self):
-        return self.cf.keys()
+        return list(self.cf.keys())
 
     def values(self):
         return [val for key, val in self.items()]