Index: Lib/cgi.py
===================================================================
--- Lib/cgi.py	(revision 66300)
+++ Lib/cgi.py	(working copy)
@@ -189,7 +189,7 @@
     """Parse a query given as a string argument."""
     warn("cgi.parse_qsl is deprecated, use urlparse.parse_qsl instead",
             PendingDeprecationWarning)
-    return urlparse.parse_qs(qs, keep_blank_values, strict_parsing)
+    return urlparse.parse_qsl(qs, keep_blank_values, strict_parsing)
 
 def parse_multipart(fp, pdict):
     """Parse multipart input.
Index: Lib/test/test_cgi.py
===================================================================
--- Lib/test/test_cgi.py	(revision 66300)
+++ Lib/test/test_cgi.py	(working copy)
@@ -344,6 +344,10 @@
         v = gen_result(data, environ)
         self.assertEqual(result, v)
 
+    def test_parse_qsl(self):
+        self.assertEqual([('a', 'A1'), ('b', 'B2'), ('B', 'B3')],
+                         cgi.parse_qsl('a=A1&b=B2&B=B3'))
+        
 def test_main():
     run_unittest(CgiTests)