Fix minor Python 3 renames and deprecations (#7)
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
# -*- encoding: utf-8 -*-
|
# -*- encoding: utf-8 -*-
|
||||||
|
|
||||||
import ConfigParser
|
import configparser
|
||||||
import io
|
import io
|
||||||
import os
|
import os
|
||||||
|
|
||||||
@@ -12,10 +12,10 @@ Canteen = namedtuple('Canteen',
|
|||||||
|
|
||||||
|
|
||||||
def _get_config(filename):
|
def _get_config(filename):
|
||||||
config = ConfigParser.SafeConfigParser()
|
config = configparser.ConfigParser()
|
||||||
path = os.path.join(os.path.dirname(__file__), filename)
|
path = os.path.join(os.path.dirname(__file__), filename)
|
||||||
with io.open(path, encoding='utf-8') as config_file:
|
with io.open(path, encoding='utf-8') as config_file:
|
||||||
config.readfp(config_file)
|
config.read_file(config_file)
|
||||||
return config
|
return config
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# -*- encoding: utf-8 -*-
|
# -*- encoding: utf-8 -*-
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import urlparse
|
import urllib.parse
|
||||||
|
|
||||||
from flask import Flask, jsonify, make_response, url_for
|
from flask import Flask, jsonify, make_response, url_for
|
||||||
from flask.logging import create_logger
|
from flask.logging import create_logger
|
||||||
@@ -21,7 +21,7 @@ app.url_map.strict_slashes = False
|
|||||||
log = create_logger(app)
|
log = create_logger(app)
|
||||||
|
|
||||||
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'))
|
base_url = urllib.parse.urlparse(os.environ.get('BASE_URL'))
|
||||||
if base_url.scheme:
|
if base_url.scheme:
|
||||||
app.config['PREFERRED_URL_SCHEME'] = base_url.scheme
|
app.config['PREFERRED_URL_SCHEME'] = base_url.scheme
|
||||||
if base_url.netloc:
|
if base_url.netloc:
|
||||||
@@ -33,7 +33,7 @@ cache = SimpleCache()
|
|||||||
|
|
||||||
|
|
||||||
def canteen_not_found(config, canteen_name):
|
def canteen_not_found(config, canteen_name):
|
||||||
log.warn('Canteen %s not found', canteen_name)
|
log.warning('Canteen %s not found', canteen_name)
|
||||||
configured = ', '.join("'{}'".format(c) for c in config.keys())
|
configured = ', '.join("'{}'".format(c) for c in config.keys())
|
||||||
message = "Canteen '{0}' not found, available: {1}".format(canteen_name,
|
message = "Canteen '{0}' not found, available: {1}".format(canteen_name,
|
||||||
configured)
|
configured)
|
||||||
|
|||||||
Reference in New Issue
Block a user