Remove the use of urllib for SSL connections

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import json
 import logging
 import optparse
 import os
 import re
 import stat
 import sys
 import textwrap
 import urlparse
-import urllib
 import urllib2
 
 try:
   import readline  # pylint: disable=F0401,W0611
 except ImportError:
   pass
 
 
 from third_party import upload
 import breakpad  # pylint: disable=W0611
@@ skipping 719 matching lines @@
     RunGit(['config', 'gerrit.port', keyvals['GERRIT_PORT']])
 
   if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals:
     #should be of the form
     #PUSH_URL_CONFIG: url.ssh://gitrw.chromium.org.pushinsteadof
     #ORIGIN_URL_CONFIG: http://src.chromium.org/git
     RunGit(['config', keyvals['PUSH_URL_CONFIG'],
             keyvals['ORIGIN_URL_CONFIG']])
 
 
+def urlretrieve(source, destination):
+  with open(destination, 'w+') as f:

[M-A Ruel, 2012/08/01 13:57:21]

Why more 'w+'? Please use 'w'

Also add a doctring explaining the reason of this code, basically what you wrote
in the CL description. E.g.
"""Work around SSL connection behind an http proxy on python <2.6.3."""

Actually, I'd like you to look at sys.version and call the original function
otherwise.

[joshuagl, 2012/08/01 18:50:20]

Will do both of the above.
Sadly, that won't work - I was seeing urlretrieve() fail with Python 2.7.3.

AIUI urllib is still broken in Python 2.7, only urllib2 was fixed for the SSL
issues -> urlretrieve() in urllib uses the broken urllib.urlopen() and the
urlretrieve() method doesn't exist in urllib2.

I wondered about providing a custom URLOpener subclass to urllib using urllib2
but it's a non-trivial amount of code (for Python) and started feeling a bit
like Yak shaving.

+    f.write(urllib2.urlopen(source).read())
+
+
 def DownloadHooks(force):
   """downloads hooks
 
   Args:
     force: True to update hooks. False to install hooks if not present.
   """
   if not settings.GetIsGerrit():
     return
   server_url = settings.GetDefaultServerUrl()
   src = '%s/tools/hooks/commit-msg' % server_url
   dst = os.path.join(settings.GetRoot(), '.git', 'hooks', 'commit-msg')
   if not os.access(dst, os.X_OK):
     if os.path.exists(dst):
       if not force:
         return
       os.remove(dst)
     try:
-      urllib.urlretrieve(src, dst)
+      urlretrieve(src, dst)
       os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
     except Exception:
       if os.path.exists(dst):
         os.remove(dst)
       DieWithError('\nFailed to download hooks from %s' % src)
 
 
 @usage('[repo root containing codereview.settings]')
 def CMDconfig(parser, args):
   """edit configuration for this tree"""
@@ skipping 815 matching lines @@
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))