Reverting the Revision: 77368. I committed Flox's big patch for tests by

mistake. ( It may come in for sure tough)

Lib/test/test_urllib.py

@@ -6,7 +6,6 @@ import unittest
 from test import test_support
 import os
 import mimetools
-import random
 import tempfile
 import StringIO
 
@@ -102,7 +101,7 @@ class ProxyTests(unittest.TestCase):
         # Records changes to env vars
         self.env = test_support.EnvironmentVarGuard()
         # Delete all proxy related env vars
-        for k in os.environ.keys():
+        for k, v in os.environ.iteritems():
             if 'proxy' in k.lower():
                 self.env.unset(k)
 
@@ -410,13 +409,6 @@ class QuotingTests(unittest.TestCase):
         self.assertEqual(urllib.quote_plus('alpha+beta gamma', '+'),
                          'alpha+beta+gamma')
 
-    def test_quote_leak(self):
-        # bug 5596 - highlight the refleak in the internal _safemaps cache
-        safe = ''.join(chr(random.randrange(128)) for i in '123456')
-        text = 'abcdefghijklmnopqrstuvwxyz'
-        result = urllib.quote(text, safe=safe)
-        self.assertEqual(result, text)
-
 class UnquotingTests(unittest.TestCase):
     """Tests for unquote() and unquote_plus()