Clean up long lines according to PEP8

creators/AgencyCreator.py

@@ -20,21 +20,22 @@ def add_agency_to_schedule(self, schedule):
 
     def prepare_agency(self):
         """
-        Loads agency data from a json config file. The valid keys under the json
-        "agency" object correspond to the transitfeed.Agency field names.
+        Loads agency data from a json config file. The valid keys under the
+        json "agency" object correspond to the transitfeed.Agency field names.
 
         Return a transitfeed.Agency object
         """
-        fields = ['agency_name', 'agency_url', 'agency_timezone', 'agency_id', 'agency_lang',
-                  'agency_phone', 'agency_fare_url']
+        fields = ['agency_name', 'agency_url', 'agency_timezone', 'agency_id',
+                  'agency_lang', 'agency_phone', 'agency_fare_url']
         data_dict = {}
         for field_name in fields:
             if field_name in self.config["agency"]:
                 field_value = self.config["agency"][field_name]
                 if field_value is not None and field_value != "":
                     data_dict[field_name] = field_value
             else:
-                sys.stderr.write("Warning: Key '" + field_name + "' was not found in the config file.")
+                sys.stderr.write("Warning: Key '" + field_name +
+                                 "' was not found in the config file.")
 
         agency = transitfeed.Agency(field_dict=data_dict)
 

creators/FeedInfoCreator.py

@@ -22,11 +22,12 @@ def prepare_feed_info(self):
         Loads feed info data from a json config file.
         Return a transitfeed.FeedInfo object
         """
+        config = self.config
         feed_info = transitfeed.FeedInfo()
-        feed_info.feed_publisher_name = self.config['feed_info']['publisher_name']
-        feed_info.feed_publisher_url = self.config['feed_info']['publisher_url']
-        feed_info.feed_lang = self.config['agency']['agency_lang']
-        feed_info.feed_start_date = self.config['feed_info']['start_date']
-        feed_info.feed_end_date = self.config['feed_info']['end_date']
-        feed_info.feed_version = self.config['feed_info']['version']
+        feed_info.feed_publisher_name = config['feed_info']['publisher_name']
+        feed_info.feed_publisher_url = config['feed_info']['publisher_url']
+        feed_info.feed_lang = config['agency']['agency_lang']
+        feed_info.feed_start_date = config['feed_info']['start_date']
+        feed_info.feed_end_date = config['feed_info']['end_date']
+        feed_info.feed_version = config['feed_info']['version']
         return feed_info

factory/CreatorFactory.py

@@ -27,45 +27,61 @@ def __repr__(self):
 
     def get_agency_creator(self):
         try:
-            agency_creator_override = getattr(importlib.import_module("creators." + self.selector + ".AgencyCreator" + self.selector), "AgencyCreator" + self.selector)
-            print "Using " + self.selector + " implementation for creation of the agency (AgencyCreator" + self.selector + ")"
+            module = importlib.import_module(
+                "creators." + self.selector + ".AgencyCreator" + self.selector)
+            agency_creator_override = getattr(
+                module, "AgencyCreator" + self.selector)
+            print "Agency creator: " + self.selector
             return agency_creator_override(self.config)
         except ImportError:
-            print "Using default implementation for creation of the agency"
+            print "Agency creator: Default"
             return AgencyCreator(self.config)
 
     def get_feed_info_creator(self):
+        selector = self.selector
         try:
-            feed_info_creator_override = getattr(importlib.import_module("creators." + self.selector + ".FeedInfoCreator" + self.selector), "FeedInfoCreator" + self.selector)
-            print "Using " + self.selector + " implementation for creation of the feed info (FeedInfoCreator" + self.selector + ")"
+            module = importlib.import_module(
+                "creators." + selector + ".FeedInfoCreator" + selector)
+            feed_info_creator_override = getattr(
+                module, "FeedInfoCreator" + selector)
+            print "Feed info creator: " + selector
             return feed_info_creator_override(self.config)
         except ImportError:
-            print "Using default implementation for creation of the feed info"
+            print "Feed info creator: Default"
             return FeedInfoCreator(self.config)
 
     def get_routes_creator(self):
         try:
-            routes_creator_override = getattr(importlib.import_module("creators." + self.selector + ".RoutesCreator" + self.selector), "RoutesCreator" + self.selector)
-            print "Using " + self.selector + " implementation for creation of routes (RoutesCreator" + self.selector + ")"
+            module = importlib.import_module(
+                "creators." + self.selector + ".RoutesCreator" + self.selector)
+            routes_creator_override = getattr(
+                module, "RoutesCreator" + self.selector)
+            print "Routes creator: " + self.selector
             return routes_creator_override(self.config)
         except ImportError:
-            print "Using default implementation for creation of routes"
+            print "Routes creator: Default"
             return RoutesCreator(self.config)
 
     def get_stops_creator(self):
         try:
-            stops_creator_override = getattr(importlib.import_module("creators." + self.selector + ".StopsCreator" + self.selector), "StopsCreator" + self.selector)
-            print "Using " + self.selector + " implementation for creation of stops (StopsCreator" + self.selector + ")"
+            module = importlib.import_module(
+                "creators." + self.selector + ".StopsCreator" + self.selector)
+            stops_creator_override = getattr(
+                module, "StopsCreator" + self.selector)
+            print "Stops creator: " + self.selector
             return stops_creator_override(self.config)
         except ImportError:
-            print "Using default implementation for creation of stops"
+            print "Stops creator: Default"
             return StopsCreator(self.config)
 
     def get_trips_creator(self):
         try:
-            trips_creator_override = getattr(importlib.import_module("creators." + self.selector + ".TripsCreator" + self.selector), "TripsCreator" + self.selector)
-            print "Using " + self.selector + " implementation for creation of trips (TripsCreator" + self.selector + ")"
+            module = importlib.import_module(
+                "creators." + self.selector + ".TripsCreator" + self.selector)
+            trips_creator_override = getattr(
+                module, "TripsCreator" + self.selector)
+            print "Trips creator: " + self.selector
             return trips_creator_override(self.config)
         except ImportError:
-            print "Using default implementation for creation of trips"
+            print "Trips creator: Default"
             return TripsCreator(self.config)

osm2gtfs.py

@@ -10,18 +10,25 @@
 from factory.CreatorFactory import CreatorFactory
 
 # Handle arguments
-parser = argparse.ArgumentParser(prog='osm2gtfs', description='Create GTFS from OpenStreetMap data.')
+parser = argparse.ArgumentParser(
+    prog='osm2gtfs', description='Create GTFS from OpenStreetMap data.')
 
 # Filename arguments for config and output file
-parser.add_argument('--config', '-c', metavar='FILE', type=argparse.FileType('r'), help='Configuration json file')
-parser.add_argument('--output', '-o', metavar='FILENAME', type=str, help='Specify GTFS output zip file')
+parser.add_argument('--config', '-c', metavar='FILE',
+                    type=argparse.FileType('r'), help='Configuration file')
+parser.add_argument('--output', '-o', metavar='FILENAME',
+                    type=str, help='Specify GTFS output zip file')
 
 # Refresh caching arguments
 group = parser.add_mutually_exclusive_group()
-group.add_argument('--refresh-route', metavar='ROUTE', type=int, help='Refresh OSM data for ROUTE')
-group.add_argument('--refresh-all-routes', action="store_true", help='Refresh OSM data for all routes')
-group.add_argument('--refresh-all-stops', action="store_true", help='Refresh OSM data for all stops')
-group.add_argument('--refresh-all', action="store_true", help='Refresh all OSM data')
+group.add_argument('--refresh-route', metavar='ROUTE',
+                   type=int, help='Refresh OSM data for ROUTE')
+group.add_argument('--refresh-all-routes', action="store_true",
+                   help='Refresh OSM data for all routes')
+group.add_argument('--refresh-all-stops', action="store_true",
+                   help='Refresh OSM data for all stops')
+group.add_argument('--refresh-all', action="store_true",
+                   help='Refresh all OSM data')
 args = parser.parse_args()
 
 
@@ -47,13 +54,15 @@ def main():
 
     # --refresh-route
     if args.refresh_route is not None:
-        OsmHelper.refresh_route(args.refresh_route, "bus", config['query']['bbox'])
+        OsmHelper.refresh_route(
+            args.refresh_route, "bus", config['query']['bbox'])
         sys.exit(0)
     elif args.refresh_all_routes:
         OsmHelper.get_routes("bus", config['query']['bbox'], refresh=True)
         sys.exit(0)
     elif args.refresh_all_stops:
-        OsmHelper.get_stops(OsmHelper.get_routes("bus", config['query']['bbox']), refresh=True)
+        OsmHelper.get_stops(OsmHelper.get_routes(
+            "bus", config['query']['bbox']), refresh=True)
         sys.exit(0)
     elif args.refresh_all:
         OsmHelper.refresh_data("bus", config['query']['bbox'])