Handle KeyboardInterrupt consistently in python scripts

upload_to_google_storage.py

Index: upload_to_google_storage.py
diff --git a/upload_to_google_storage.py b/upload_to_google_storage.py
index e81e0198f2a2f1f8b6d71acb1a91e2e7bf92676d..d88597cef0cfab13226e158fd829f85a387db791 100755
--- a/upload_to_google_storage.py
+++ b/upload_to_google_storage.py
@@ -203,7 +203,7 @@ def upload_to_google_storage(
   return max_ret_code
 
 
-def main(args):
+def main():
   parser = optparse.OptionParser(USAGE_STRING)
   parser.add_option('-b', '--bucket',
                     help='Google Storage bucket to upload to.')
@@ -248,4 +248,8 @@ def main(args):
 
 
 if __name__ == '__main__':
-  sys.exit(main(sys.argv))
+  try:
+    sys.exit(main())
+  except KeyboardInterrupt:
+    sys.stderr.write('interrupted\n')
+    sys.exit(1)