Fix apply_issue.py to work on python 2.6.

apply_issue.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.
 
 """Applies an issue from Rietveld.
 """
 
 import logging
 import optparse
@@ skipping 41 matching lines @@
     parser.error('Extra argument(s) "%s" not understood' % ' '.join(args))
   if not options.issue:
     parser.error('Require --issue')
   options.server = options.server.rstrip('/')
   if not options.server:
     parser.error('Require a valid server')
 
   obj = rietveld.Rietveld(options.server, '', None)
   try:
     properties = obj.get_issue_properties(options.issue, False)
-  except rietveld.upload.ClientLoginError:
-    # Requires login.
+  except rietveld.upload.ClientLoginError, e:
+    if sys.stdout.closed:
+      print >> sys.stderr, 'Accessing the issue requires login.'

[M-A Ruel, 2012/09/03 17:34:25]

Hopefully, this should refrain from causing times out on private issues.

+      return 1
+    print('Accessing the issue requires login.')
     obj = rietveld.Rietveld(options.server, None, None)
     properties = obj.get_issue_properties(options.issue, False)
 
   if not options.patchset:
     options.patchset = properties['patchsets'][-1]
     print('No patchset specified. Using patchset %d' % options.patchset)
 
   print('Downloading the patch.')
   try:
     patchset = obj.get_patch(options.issue, options.patchset)
   except urllib2.HTTPError, e:
     print >> sys.stderr, (
         'Failed to fetch the patch for issue %d, patchset %d.\n'
         'Try visiting %s/%d') % (
             options.issue, options.patchset,
             options.server, options.issue)
     return 1
   for patch in patchset.patches:
     print(patch)
   scm_type = scm.determine_scm(options.root_dir)
   if scm_type == 'svn':
     scm_obj = checkout.SvnCheckout(options.root_dir, None, None, None, None)
   elif scm_type == 'git':
     scm_obj = checkout.GitCheckoutBase(options.root_dir, None, None)
   elif scm_type == None:
-    scm_obj = checkout.RawCheckout(options.root_dir, None)
+    scm_obj = checkout.RawCheckout(options.root_dir, None, None)
   else:
     parser.error('Couldn\'t determine the scm')
 
   # Apply the patch.
   try:
     scm_obj.apply_patch(patchset)
   except checkout.PatchApplicationFailed, e:
     print >> sys.stderr, str(e)
     return 1
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(main())