Added implicit empty password to 'presubmit_support.py'

presubmit_support.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.
 
 """Enables directory-specific presubmit checks to run at upload and/or commit.
 """
 
 __version__ = '1.8.0'
 
@@ skipping 1541 matching lines @@
   if options.verbose >= 2:
     logging.basicConfig(level=logging.DEBUG)
   elif options.verbose:
     logging.basicConfig(level=logging.INFO)
   else:
     logging.basicConfig(level=logging.ERROR)
 
   if options.rietveld_email and options.rietveld_email_file:
     parser.error("Only one of --rietveld_email or --rietveld_email_file "
                  "can be passed to this program.")
-  if options.rietveld_private_key_file and options.rietveld_password:
-    parser.error("Only one of --rietveld_private_key_file or "
-                 "--rietveld_password can be passed to this program.")
+  if options.rietveld_private_key_file:
+    if options.rietveld_password:
+      parser.error("Only one of --rietveld_private_key_file or "
+                   "--rietveld_password can be passed to this program.")
+  elif not options.rietveld_password:

[nodir, 2014/04/15 03:16:47]

I would be more explicit:
  options.rietveld_password is None

+    # Default to empty password if neither e-mail nor password is supplied
+    options.rietveld_password = ''
+
   if options.rietveld_email_file:
     with open(options.rietveld_email_file, "rb") as f:
       options.rietveld_email = f.read().strip()
 
   change_class, files = load_files(options, args)
   if not change_class:
     parser.error('For unversioned directory, <files> is not optional.')
   logging.info('Found %d file(s).' % len(files))
 
   rietveld_obj = None
   if options.rietveld_url:
     # The empty password is permitted: '' is not None.
     if options.rietveld_password is not None:
       rietveld_obj = rietveld.CachingRietveld(
         options.rietveld_url,
         options.rietveld_email,
         options.rietveld_password)
     elif options.rietveld_private_key_file:

[ghost stip (do not use), 2014/04/15 03:21:39]

suggestion: we could do this if check first and if it fails, unconditionally do
lines 1583 and remove the else on line 1592:

if options.rietveld_private_key_file:
  rietveld_obj = rietveld.JwtOAuth2Rietveld(...)
else:
  rietveld_obj = rietveld.CachingRietveld(...)

this should preserve the old behavior

       rietveld_obj = rietveld.JwtOAuth2Rietveld(
         options.rietveld_url,
         options.rietveld_email,
         options.rietveld_private_key_file)
     else:
       parser.error("No password or secret key has been provided for "
                    "Rietveld. Unable to connect.")
     if options.rietveld_fetch:
       assert options.issue
       props = rietveld_obj.get_issue_properties(options.issue, False)
@@ skipping 51 matching lines @@
   except PresubmitFailure, e:
     print >> sys.stderr, e
     print >> sys.stderr, 'Maybe your depot_tools is out of date?'
     print >> sys.stderr, 'If all fails, contact maruel@'
     return 2
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(Main(None))