minor code improvements

osm/xml_handler.py

@@ -99,8 +99,7 @@ def startElement(self, name: str, attrs: AttributesImpl) -> None:
                         # more info: https://help.openstreetmap.org/questions/61025/pragmatic-single-level-indoor-paths
                         if attrs["v"] == "corridor":
                             self.current_way.highway = "pedestrian_indoor"
-            except:
-                e = sys.exc_info()[0]
+            except Exception as e:
                 print(f"Error while parsing: {e}")
 
     def endElement(self, name: str) -> None:

output/write_graph.py

@@ -1,4 +1,3 @@
-import codecs
 import contextlib
 import json
 
@@ -18,7 +17,10 @@ def write_to_file(graph, filename_base, filename_ext):
 # edge_properties
 # ..."""
 
-    with open(filename, "w", encoding="utf-8") as f, codecs.open(f"{filename}_names", "w", "utf-8") as f_names:
+    with (
+        open(filename, "w", encoding="utf-8") as f,
+        open(f"{filename}_names", "w", encoding="utf-8") as f_names,
+    ):
         f.write(f"{file_header}\n")
         f.write(f"{header}\n")
 
@@ -35,9 +37,6 @@ def write_to_file(graph, filename_base, filename_ext):
             f_names.write(e.data.name)
             f_names.write("\n")
 
-    f.close()
-    f_names.close()
-
 
 def write_nx_to_file(nx_graph, filename):
     print(f"writing networkx output file: {filename}")

run.py

@@ -86,25 +86,12 @@ def validate_networkx():
         parser.print_help()
         sys.exit()
 
-    try:
-        if not os.path.isfile(filename):
-            raise FileNotFoundError(f"Provided filename {filename} does not point to a file!")
-
-        long_network_type = {"p": "pedestrian", "c": "car", "b": "bicycle"}
-        if options.network_type in long_network_type:
-            network_type = long_network_type[options.network_type]
-        elif options.network_type == long_network_type.values():
-            network_type = options.network_type
-        else:
-            print("ERROR: network type improperly set")
-            sys.exit(1)
-    except FileNotFoundError as e:
-        print(f"ERROR: {e}")
-        sys.exit(1)
-    except ValueError as e:
-        print(f"ERROR: {e}")
+    if not os.path.isfile(filename):
+        print(f"ERROR: Provided filename {filename} does not point to a file!")
         sys.exit(1)
 
+    network_type = {"p": "pedestrian", "c": "car", "b": "bicycle"}[options.network_type]
+
     try:
         convert_osm_to_roadgraph(filename, network_type, options)
     except Exception as e: