1 files changed, 11 insertions, 2 deletions
diff --git a/Lib/cgi.py b/Lib/cgi.py
index cb92cfc77b..01a28fe4b6 100755
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -40,7 +40,7 @@ import os
 import urllib
 import mimetools
 import rfc822
-import UserDict
+import collections
 from io import StringIO
 
 __all__ = ["MiniFieldStorage", "FieldStorage", "FormContentDict",
@@ -781,7 +781,7 @@ class FieldStorage:
 # Backwards Compatibility Classes
 # ===============================
 
-class FormContentDict(UserDict.UserDict):
+class FormContentDict(collections.Mapping):
     """Form content as dictionary with a list of values per field.
 
     form = FormContentDict()
@@ -800,6 +800,15 @@ class FormContentDict(UserDict.UserDict):
                                       strict_parsing=strict_parsing)
         self.query_string = environ['QUERY_STRING']
 
+    def __len__(self):
+        return len(self.dict)
+
+    def __iter__(self):
+        return iter(self.dict)
+
+    def __getitem__(self, key):
+        return self.dict[key]
+
 
 class SvFormContentDict(FormContentDict):
     """Form content as dictionary expecting a single value per field.