e.stderr may be None

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.
 """
 
 import datetime
@@ skipping 354 matching lines @@
         gclient_utils.FileWrite(full_path, options.diff, 'wb')
       else:
         # Add the file to the repo.
         gclient_utils.FileWrite(full_path, options.diff, 'wb')
         gclient_utils.CheckCall(["svn", "add", full_path], print_error=False)
       temp_file.write(description)
       temp_file.flush()
       gclient_utils.CheckCall(["svn", "commit", full_path, '--file',
                                temp_file.name], print_error=False)
     except gclient_utils.CheckCallError, e:
-      raise NoTryServerAccess(' '.join(e.command) + '\nOuput:\n' +
-                              e.stdout + e.stderr)
+      out = e.stdout
+      if e.stderr:
+        out += e.stderr
+      raise NoTryServerAccess(' '.join(e.command) + '\nOuput:\n' + out)
   finally:
     temp_file.close()
     shutil.rmtree(temp_dir, True)
 
 
 def PrintSuccess(options):
   if not options.dry_run:
     text = 'Patch \'%s\' sent to try server' % options.name
     if options.bot:
       text += ': %s' % ', '.join(options.bot)
@@ skipping 313 matching lines @@
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, [], False))