Upgrade to python3

Author: jonthornton

README.md

@@ -232,13 +232,13 @@ Lists available routes.
 
 ## Running the server
 
-MTAPI is a Flask app designed to run under Python 2.7.
+MTAPI is a Flask app designed to run under Python 3.3+.
 
 1. Create a `settings.cfg` file. A sample is provided as `settings.cfg.sample`.
 2. Set up your environment and install dependencies.  
-`$ virtualenv .venv`  
+`$ python3 -m venv .venv`  
 `$ source .venv/bin/activate`  
-`$ pip install -r requirements.txt`
+`$ python3 -m pip install -r requirements.txt`
 3. Run the server  
 `$ python app.py`
 

app.py

@@ -9,11 +9,11 @@
     :license: BSD, see LICENSE for more details.
 """
 
-from mtapi import Mtapi
+from mtapi.mtapi import Mtapi
 from flask import Flask, request, jsonify, render_template, abort
 from flask.json import JSONEncoder
 from datetime import datetime
-from functools import wraps
+from functools import wraps, reduce
 import logging
 import os
 
@@ -89,7 +89,7 @@ def by_location():
     try:
         location = (float(request.args['lat']), float(request.args['lon']))
     except KeyError as e:
-        print e
+        print(e)
         response = jsonify({
             'error': 'Missing lat/lon parameter'
             })

mtapi/__init__.py

@@ -1 +0,0 @@
-from mtapi import Mtapi

mtapi/mtapi.py

@@ -1,12 +1,12 @@
-import urllib2, contextlib, datetime, copy
+import urllib, contextlib, datetime, copy
 from collections import defaultdict
 from operator import itemgetter
 import csv, math, json
 import threading
 import logging
 import google.protobuf.message
 from mtaproto.feedresponse import FeedResponse, Trip, TripStop, TZ
-from _mtapithreader import _MtapiThreader
+from mtapi._mtapithreader import _MtapiThreader
 
 logger = logging.getLogger(__name__)
 
@@ -86,7 +86,7 @@ def __init__(self, key, stations_file, expires_seconds=60, max_trains=10, max_mi
                 self._stops_to_stations = self._build_stops_index(self._stations)
 
         except IOError as e:
-            print 'Couldn\'t load stations file '+stations_file
+            print('Couldn\'t load stations file '+stations_file)
             exit()
 
         self._update()
@@ -106,13 +106,13 @@ def _build_stops_index(stations):
 
     def _load_mta_feed(self, feed_url):
         try:
-            request = urllib2.Request(feed_url)
+            request = urllib.request.Request(feed_url)
             request.add_header('x-api-key', self._KEY)
-            with contextlib.closing(urllib2.urlopen(request)) as r:
+            with contextlib.closing(urllib.request.urlopen(request)) as r:
                 data = r.read()
                 return FeedResponse(data)
 
-        except (urllib2.URLError, google.protobuf.message.DecodeError) as e:
+        except (urllib.error.URLError, google.protobuf.message.DecodeError) as e:
             logger.error('Couldn\'t connect to MTA server: ' + str(e))
             return False
 

mtaproto/nyct_subway_pb2.py

@@ -16,7 +16,7 @@ pluggy==0.13.0
 protobuf==3.9.1
 py==1.8.0
 pyparsing==2.4.2
-pytest==4.6.5
+pytest==5.1.2
 pytz==2019.2
 scandir==1.10.0
 six==1.12.0