diff options
Diffstat (limited to 'opendc/util')
| -rw-r--r-- | opendc/util/database.py | 10 | ||||
| -rw-r--r-- | opendc/util/parameter_checker.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/opendc/util/database.py b/opendc/util/database.py index 24572279..50bc93a8 100644 --- a/opendc/util/database.py +++ b/opendc/util/database.py @@ -7,11 +7,13 @@ from pymongo import MongoClient DATETIME_STRING_FORMAT = '%Y-%m-%dT%H:%M:%S' CONNECTION_POOL = None -DB = None class Database: - def __init__(self, user, password, database, host): + def __init__(self): + self.opendc_db = None + + def init_database(self, user, password, database, host): user = urllib.parse.quote_plus(user) # TODO: replace this with environment variable password = urllib.parse.quote_plus(password) # TODO: same as above database = urllib.parse.quote_plus(database) @@ -88,6 +90,4 @@ class Database: return datetime.strptime(string_to_convert, DATETIME_STRING_FORMAT) -def initialize_database(user, password, database, host): - global DB - DB = Database(user, password, database, host) +DB = Database() diff --git a/opendc/util/parameter_checker.py b/opendc/util/parameter_checker.py index d3e7ef13..bf02ba9b 100644 --- a/opendc/util/parameter_checker.py +++ b/opendc/util/parameter_checker.py @@ -48,7 +48,7 @@ def _incorrect_parameter(params_required, params_actual, parent=''): if param_required == 'int' and not isinstance(param_actual, int): return '{}.{}'.format(parent, param_name) - if param_required == 'string' and not isinstance(param_actual, basestring): + if param_required == 'string' and not isinstance(param_actual, str): return '{}.{}'.format(parent, param_name) if param_required.startswith('list') and not isinstance(param_actual, list): |