From c0ecc6a329ca5da588d4f50775d305b05a3d0ca1 Mon Sep 17 00:00:00 2001 From: blitzman Date: Mon, 23 Jan 2017 21:07:20 -0500 Subject: [PATCH] tweaks to fix merge issues --- service/prefetch.py | 6 +++--- service/pycrest/eve.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/service/prefetch.py b/service/prefetch.py index 72445dd1a..6e86683e5 100644 --- a/service/prefetch.py +++ b/service/prefetch.py @@ -68,9 +68,9 @@ if config.saveDB and os.path.isfile(config.saveDB): logging.debug("Starting database validation.") database_cleanup_instance = DatabaseCleanup() - database_cleanup_instance.OrphanedCharacterSkills(eos.db.saveddata_engine) - database_cleanup_instance.OrphanedFitCharacterIDs(eos.db.saveddata_engine) - database_cleanup_instance.OrphanedFitDamagePatterns(eos.db.saveddata_engine) + database_cleanup_instance.OrphanedCharacterSkills(db.saveddata_engine) + database_cleanup_instance.OrphanedFitCharacterIDs(db.saveddata_engine) + database_cleanup_instance.OrphanedFitDamagePatterns(db.saveddata_engine) logging.debug("Completed database validation.") else: diff --git a/service/pycrest/eve.py b/service/pycrest/eve.py index 402813773..5f6fa9ffc 100644 --- a/service/pycrest/eve.py +++ b/service/pycrest/eve.py @@ -13,9 +13,9 @@ from service.pycrest.compat import bytes_, text_ from service.pycrest.errors import APIException try: - from urllib.parse import urlparse, urlunparse, parse_qsl, quote + from urllib.parse import urlparse, urlunparse, parse_qsl except ImportError: # pragma: no cover - from urlparse import urlparse, urlunparse, parse_qsl, quote + from urlparse import urlparse, urlunparse, parse_qsl try: import pickle