python: Resolve some indentation warnings.

[cascardo/ovs.git] / ofproto / ipfix-gen-entities

diff --git a/ofproto/ipfix-gen-entities b/ofproto/ipfix-gen-entities
index 4d4e0de..11d2aaf 100755 (executable)
--- a/ofproto/ipfix-gen-entities
+++ b/ofproto/ipfix-gen-entities
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#! /usr/bin/env python
 #
 # Copyright (C) 2012 Nicira, Inc.
 #
@@ -13,6 +13,7 @@ import sys
 import xml.sax
 import xml.sax.handler
 
+
 class IpfixEntityHandler(xml.sax.handler.ContentHandler):
 
     RECORD_FIELDS = ['name', 'dataType', 'elementId', 'status']
@@ -90,9 +91,11 @@ class IpfixEntityHandler(xml.sax.handler.ContentHandler):
         if self.current_field_name is not None:
             self.current_field_value.append(content)
 
+
 def print_ipfix_entity_macros(xml_file):
     xml.sax.parse(xml_file, IpfixEntityHandler())
 
+
 def usage(name):
     print """\
 %(name)s: IPFIX entity definition generator
@@ -108,32 +111,27 @@ The following options are also available:
     sys.exit(0)
 
 if __name__ == '__main__':
-#    try:
-        try:
-            options, args = getopt.gnu_getopt(sys.argv[1:], 'hV',
-                                              ['help', 'version'])
-        except getopt.GetoptError, geo:
-            sys.stderr.write('%s: %s\n' % (sys.argv[0], geo.msg))
-            sys.exit(1)
-
-        for key, value in options:
-            if key in ['-h', '--help']:
-                usage()
-            elif key in ['-V', '--version']:
-                print 'ipfix-gen-entities (Open vSwitch)'
-            else:
-                sys.exit(0)
-
-        if len(args) != 1:
-            sys.stderr.write('%s: exactly 1 non-option arguments required '
-                             '(use --help for help)\n' % sys.argv[0])
-            sys.exit(1)
-
-        print_ipfix_entity_macros(args[0])
-
-#    except Exception, e:
-#        sys.stderr.write('%s: %s\n' % (sys.argv[0], e))
-#        sys.exit(1)
+    try:
+        options, args = getopt.gnu_getopt(sys.argv[1:], 'hV',
+                                          ['help', 'version'])
+    except getopt.GetoptError, geo:
+        sys.stderr.write('%s: %s\n' % (sys.argv[0], geo.msg))
+        sys.exit(1)
+
+    for key, value in options:
+        if key in ['-h', '--help']:
+            usage()
+        elif key in ['-V', '--version']:
+            print 'ipfix-gen-entities (Open vSwitch)'
+        else:
+            sys.exit(0)
+
+    if len(args) != 1:
+        sys.stderr.write('%s: exactly 1 non-option arguments required '
+                         '(use --help for help)\n' % sys.argv[0])
+        sys.exit(1)
+
+    print_ipfix_entity_macros(args[0])
 
 # Local variables:
 # mode: python