Small cleanup

trychange.py

 #!/usr/bin/python
 # Copyright (c) 2009 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.
 """
 
 
@@ skipping 34 matching lines @@
     %prog --url http://url/to/patch.diff --patchlevel 1 --root src
 
   Use svn to store the try job, specify an alternate email address and use a
   premade diff file on the local drive:
     %prog --email user@example.com
             --svn_repo svn://svn.chromium.org/chrome-try/try --diff foo.diff
 
   Running only on a 'mac' slave with revision 123 and clobber first; specify
   manually the 3 source files to use for the try job:
     %prog --bot mac --revision 123 --clobber -f src/a.cc -f src/a.h
-            -f include/b.h
-
-"""
+            -f include/b.h"""
 
 class InvalidScript(Exception):
   def __str__(self):
     return self.args[0] + '\n' + HELP_STRING
 
 
 class NoTryServerAccess(Exception):
   def __str__(self):
     return self.args[0] + '\n' + HELP_STRING
 
@@ skipping 432 matching lines @@
   parser.add_option_group(group)
 
   options, args = parser.parse_args(argv)
 
   # Switch the default accordingly if there was no default send_patch.
   if not options.send_patch:
     if options.port and options.host:
       options.send_patch = _SendChangeHTTP
     elif options.svn_repo:
       options.send_patch = _SendChangeSVN
+    else:
+      parser.error('Please specify an access method.')
 
   if len(args) == 1 and args[0] == 'help':
     parser.print_help()
   if (not options.files and (not options.issue and options.patchset) and
       not options.diff and not options.url):
     # TODO(maruel): It should just try the modified files showing up in a
     # svn status.
-    print "Nothing to try, changelist is empty."
-    return 1
+    parser.error('Nothing to try, changelist is empty.')
 
   try:
     # Convert options.diff into the content of the diff.
     if options.url:
       options.diff = urllib.urlopen(options.url).read()
     elif options.diff:
       options.diff = gcl.ReadFile(options.diff)
     # Process the VCS in any case at least to retrieve the email address.
     try:
       options.scm = GuessVCS(options)
       options.scm.ProcessOptions()
     except NoTryServerAccess, e:
       # If we got the diff, we don't care.
       if not options.diff:
         # TODO(maruel): Raise what?
         raise
 
     # Get try slaves from PRESUBMIT.py files if not specified.
     if not options.bot:
       if options.url:
-        print('You need to specify which bots to use.')
-        return 1
+        parser.error('You need to specify which bots to use.')
       root_presubmit = gcl.GetCachedFile('PRESUBMIT.py', use_root=True)
       options.bot = presubmit_support.DoGetTrySlaves(options.scm.GetFileNames(),
                                                      options.scm.GetLocalRoot(),
                                                      root_presubmit,
                                                      False,
                                                      sys.stdout)
 
     if options.name is None:
       if options.issue:
         options.name = 'Issue %s' % options.issue
@@ skipping 13 matching lines @@
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, None, False))