fixes trip naming convention

app/services/feed.py

@@ -9,8 +9,12 @@
 import csv
 import resource
 import transitfeed
-import StringIO
+try:
+    from cStringIO import StringIO
+except:
+    from StringIO import StringIO
 import zipfile
+import shutil
 
 from app import db
 from ..models import *
@@ -22,7 +26,7 @@ class Feed(object):
   def __init__(self, filename='google_transit.zip', db=db):
     self.db = db
     self.filename = filename
-    self.fileObj = StringIO.StringIO()
+    self.fileObj = StringIO()
     self.trip_start_times_default = None
     self.schedule = transitfeed.Schedule(memory_db=False)
 
@@ -48,7 +52,9 @@ def build(self, mode='frequency'):
     return self.fileObj
 
   def saveTo(self, directory):
-    self.schedule.WriteGoogleTransitFeed(directory + self.filename)
+    self.fileObj.seek(0)
+    with open(directory + self.filename, 'w') as outfile:
+      shutil.copyfileobj(self.fileObj, outfile)
 
   def validate(self):
     """Validate feed object"""
@@ -132,7 +138,7 @@ def loadTrips(self, route):
           trip.service_id = service.service_id
           trip.shape_id = tripRow.shape_id
           trip.direction_id = tripRow.direction_id
-          logger.info("Loading trip_id:{0} ".format(trip_id))
+          # logger.info("Loading trip_id:{0} ".format(trip_id))
           self.loadStopTimes(trip)
 
       elif self.mode == 'initial-times':
@@ -272,13 +278,11 @@ def loadFeedInfo(self):
 
     keys = ['feed_publisher_name', 'feed_start_date', 'feed_version', 
         'feed_end_date', 'feed_lang', 'feed_publisher_url']
-    feed_info_txt = StringIO.StringIO()
+    feed_info_txt = StringIO()
     writer = csv.DictWriter(feed_info_txt, keys)
     writer.writeheader()
     for info in self.db.query(FeedInfo).all():
       uDict = {k:v.encode('utf-8') for k, v in info.to_json.iteritems() if v}
       writer.writerow(uDict)
-    with zipfile.ZipFile(self.fileObj, "a", zipfile.ZIP_DEFLATED) as z:
-      z.writestr('feed_info.txt', feed_info_txt.getvalue())
-      for item in z.filelist:
-        print item.filename
+    with zipfile.ZipFile(self.fileObj, "a", zipfile.ZIP_DEFLATED) as feed_file:
+      feed_file.writestr('feed_info.txt', feed_info_txt.getvalue())

app/tasks.py

@@ -22,7 +22,6 @@ def extract_zip(filename, dest):
 
     with zipfile.ZipFile(filename, "r") as z:
         for filename in z.namelist():
-            print filename
             with file(dest + filename, "w") as outfile:
                 outfile.write(z.read(filename))