Fix many* python scripts in src/

printing/cups_config_helper.py

Index: printing/cups_config_helper.py
diff --git a/printing/cups_config_helper.py b/printing/cups_config_helper.py
index 3c1dd4164e6060e236f34f9369baf7fbb0a07d1f..3fe5fe04e1abd4e7292d818ec028f50c8031f252 100755
--- a/printing/cups_config_helper.py
+++ b/printing/cups_config_helper.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2011 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.
@@ -20,39 +20,48 @@ import subprocess
 import sys
 
 def usage():
-    print 'usage: %s {--cflags|--ldflags|--libs}' % sys.argv[0]
-    sys.exit(1)
+  print 'usage: %s {--cflags|--ldflags|--libs}' % sys.argv[0]
+
 
 def run_cups_config(mode):
-    """Run cups-config with all --cflags etc modes, parse out the mode we want,
-    and return those flags as a list."""
-
-    cups = subprocess.Popen(['cups-config', '--cflags', '--ldflags', '--libs'],
-                            stdout=subprocess.PIPE)
-    flags = cups.communicate()[0].strip()
-
-    flags_subset = []
-    for flag in flags.split():
-        flag_mode = None
-        if flag.startswith('-l'):
-            flag_mode = '--libs'
-        elif (flag.startswith('-L') or flag.startswith('-Wl,')):
-            flag_mode = '--ldflags'
-        elif (flag.startswith('-I') or flag.startswith('-D')):
-            flag_mode = '--cflags'
-
-        # Be conservative: for flags where we don't know which mode they
-        # belong in, always include them.
-        if flag_mode is None or flag_mode == mode:
-            flags_subset.append(flag)
-
-    return flags_subset
-
-if len(sys.argv) != 2:
+  """Run cups-config with all --cflags etc modes, parse out the mode we want,
+  and return those flags as a list."""
+
+  cups = subprocess.Popen(['cups-config', '--cflags', '--ldflags', '--libs'],
+                          stdout=subprocess.PIPE)
+  flags = cups.communicate()[0].strip()
+
+  flags_subset = []
+  for flag in flags.split():
+    flag_mode = None
+    if flag.startswith('-l'):
+      flag_mode = '--libs'
+    elif (flag.startswith('-L') or flag.startswith('-Wl,')):
+      flag_mode = '--ldflags'
+    elif (flag.startswith('-I') or flag.startswith('-D')):
+      flag_mode = '--cflags'
+
+    # Be conservative: for flags where we don't know which mode they
+    # belong in, always include them.
+    if flag_mode is None or flag_mode == mode:
+      flags_subset.append(flag)
+
+  return flags_subset
+
+
+def main():
+  if len(sys.argv) != 2:
     usage()
+    return 1
 
-mode = sys.argv[1]
-if mode not in ('--cflags', '--libs', '--ldflags'):
+  mode = sys.argv[1]
+  if mode not in ('--cflags', '--libs', '--ldflags'):
     usage()
-flags = run_cups_config(mode)
-print ' '.join(flags)
+    return 1
+  flags = run_cups_config(mode)
+  print ' '.join(flags)
+  return 0
+
+
+if __name__ == '__main__':
+  sys.exit(main())