Integrate pycodestyle

This commit is contained in:
Falco Duersch
2018-10-23 13:11:51 +02:00
committed by f4lco
parent 523cc8ba62
commit 57c75b02e5
12 changed files with 64 additions and 22 deletions
+2 -1
View File
@@ -2,4 +2,5 @@
from collections import namedtuple
Canteen = namedtuple('Canteen', ('key', 'name', 'street', 'city', 'id', 'chash'))
Canteen = namedtuple('Canteen',
('key', 'name', 'street', 'city', 'id', 'chash'))
+2 -1
View File
@@ -6,7 +6,8 @@ from collections import namedtuple
MenuParams = namedtuple('MenuParams', ('canteen_id', 'chash'))
URL = 'https://www.studentenwerk-potsdam.de/essen/unsere-mensen-cafeterien/detailinfos/'
URL = 'https://www.studentenwerk-potsdam.de' + \
'/essen/unsere-mensen-cafeterien/detailinfos/'
def _param_json(it):
+13 -3
View File
@@ -33,8 +33,10 @@ def _prices(offer):
price = offer[api_role]
# When no price is set, this can be empty dict
if (isinstance(price, unicode) or isinstance(price, str)) and price.strip():
result[role] = str(price) # Convert unicode to str for PyOpenMensa -> misses type check
if (isinstance(price, unicode) or isinstance(price, str)) \
and price.strip():
# Convert unicode to str for PyOpenMensa -> misses type check
result[role] = str(price)
return result
@@ -65,6 +67,14 @@ def render_meta(canteen, menu_feed_url):
builder.address = canteen.street
builder.city = canteen.city
builder.define(name="full", priority="0", url=menu_feed_url, source=None, dayOfWeek="*", dayOfMonth="*", hour="8-18", minute="0", retry="30 1")
builder.define(name='full',
priority='0',
url=menu_feed_url,
source=None,
dayOfWeek='*',
dayOfMonth='*',
hour='8-18',
minute='0',
retry='30 1')
return builder.toXMLFeed()
+10 -5
View File
@@ -15,7 +15,7 @@ CACHE_TIMEOUT = 45 * 60
app = Flask(__name__)
app.url_map.strict_slashes = False
if 'BASE_URL' in os.environ: # pragma: no cover
if 'BASE_URL' in os.environ: # pragma: no cover
base_url = urlparse.urlparse(os.environ.get('BASE_URL'))
if base_url.scheme:
app.config['PREFERRED_URL_SCHEME'] = base_url.scheme
@@ -30,8 +30,8 @@ cache = SimpleCache()
def canteen_not_found(config, canteen_name):
app.logger.warn('Canteen %s not found', canteen_name)
configured = ', '.join("'{}'".format(c) for c in config.keys())
message = "Canteen '{canteen}' not found, available: {configured}".format(canteen=canteen_name,
configured=configured)
message = "Canteen '{0}' not found, available: {1}".format(canteen_name,
configured)
return make_response(message, 404)
@@ -62,7 +62,9 @@ def canteen_menu_feed_xml(menu):
def canteen_meta_feed_xml(canteen):
menu_feed_url = url_for('canteen_menu_feed', canteen_name=canteen.key, _external=True)
menu_feed_url = url_for('canteen_menu_feed',
canteen_name=canteen.key,
_external=True)
xml = feed.render_meta(canteen, menu_feed_url)
return _canteen_feed_xml(xml)
@@ -95,7 +97,10 @@ def canteen_menu_feed(canteen_name):
@app.route('/canteens')
def canteen_index():
config = read_canteen_config()
return jsonify({key: url_for('canteen_meta_feed', canteen_name=key, _external=True) for key in config})
return jsonify({
key: url_for('canteen_meta_feed', canteen_name=key, _external=True)
for key in config
})
@app.route('/health_check')