trychange.py: Use urllib2's urlopen() instead of urllib's.

trychange.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.
 
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
 import datetime
 import errno
 import getpass
 import itertools
 import json
 import logging
 import optparse
 import os
 import posixpath
 import re
 import shutil
 import sys
 import tempfile
 import urllib
+import urllib2
 
 import breakpad  # pylint: disable=W0611
 
 import gcl
 import fix_encoding
 import gclient_utils
 import scm
 import subprocess2
 
 
@@ skipping 401 matching lines @@
     raise NoTryServerAccess('Please use the --host option to specify the try '
         'server host to connect to.')
   if not options.port:
     raise NoTryServerAccess('Please use the --port option to specify the try '
         'server port to connect to.')
 
   values = _ParseSendChangeOptions(bot_spec, options)
   values.append(('patch', options.diff))
 
   url = 'http://%s:%s/send_try_patch' % (options.host, options.port)
-  proxies = None
-  if options.proxy:
-    if options.proxy.lower() == 'none':
-      # Effectively disable HTTP_PROXY or Internet settings proxy setup.
-      proxies = {}
-    else:
-      proxies = {'http': options.proxy, 'https': options.proxy}
 
   logging.info('Sending by HTTP')
   logging.info(''.join("%s=%s\n" % (k, v) for k, v in values))
   logging.info(url)
   logging.info(options.diff)
   if options.dry_run:
     return
 
   try:
     logging.info('Opening connection...')
-    connection = urllib.urlopen(url, urllib.urlencode(values), proxies=proxies)
+    connection = urllib2.urlopen(url, urllib.urlencode(values))
     logging.info('Done')
   except IOError, e:
     logging.info(str(e))
     if bot_spec and len(e.args) > 2 and e.args[2] == 'got a bad status line':
       raise NoTryServerAccess('%s is unaccessible. Bad --bot argument?' % url)
     else:
       raise NoTryServerAccess('%s is unaccessible. Reason: %s' % (url,
                                                                   str(e.args)))
   if not connection:
     raise NoTryServerAccess('%s is unaccessible.' % url)
@@ skipping 240 matching lines @@
   group = optparse.OptionGroup(parser, "Access the try server by HTTP")
   group.add_option("--use_http",
                    action="store_const",
                    const=_SendChangeHTTP,
                    dest="send_patch",
                    help="Use HTTP to talk to the try server [default]")
   group.add_option("-H", "--host",
                    help="Host address")
   group.add_option("-P", "--port", type="int",
                    help="HTTP port")
-  group.add_option("--proxy",
-                   help="HTTP proxy")
   parser.add_option_group(group)
 
   group = optparse.OptionGroup(parser, "Access the try server with SVN")
   group.add_option("--use_svn",
                    action="store_const",
                    const=_SendChangeSVN,
                    dest="send_patch",
                    help="Use SVN to talk to the try server")
   group.add_option("-S", "--svn_repo",
                    metavar="SVN_URL",
@@ skipping 98 matching lines @@
     can_svn = options.svn_repo
     # If there was no transport selected yet, now we must have enough data to
     # select one.
     if not options.send_patch and not (can_http or can_svn):
       parser.error('Please specify an access method.')
 
     # Convert options.diff into the content of the diff.
     if options.url:
       if options.files:
         parser.error('You cannot specify files and --url at the same time.')
-      options.diff = urllib.urlopen(options.url).read()
+      options.diff = urllib2.urlopen(options.url).read()
     elif options.diff:
       if options.files:
         parser.error('You cannot specify files and --diff at the same time.')
       options.diff = gclient_utils.FileRead(options.diff, 'rb')
     elif options.issue and options.patchset is None:
       # Retrieve the patch from rietveld when the diff is not specified.
       # When patchset is specified, it's because it's done by gcl/git-try.
       api_url = '%s/api/%d' % (options.rietveld_url, options.issue)
       logging.debug(api_url)
-      contents = json.loads(urllib.urlopen(api_url).read())
+      contents = json.loads(urllib2.urlopen(api_url).read())
       options.patchset = contents['patchsets'][-1]
       diff_url = ('%s/download/issue%d_%d.diff' %
           (options.rietveld_url,  options.issue, options.patchset))
-      diff = GetMungedDiff('', urllib.urlopen(diff_url).readlines())
+      diff = GetMungedDiff('', urllib2.urlopen(diff_url).readlines())
       options.diff = ''.join(diff[0])
       changed_files = diff[1]
     else:
       # Use this as the base.
       root = checkouts[0].checkout_root
       diffs = []
       for checkout in checkouts:
         raw_diff = checkout.GenerateDiff()
         if not raw_diff:
           continue
@@ skipping 67 matching lines @@
     return 1
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(TryChange(None, None, False))