tweaks to fix merge issues

This commit is contained in:
blitzman
2017-01-23 21:07:20 -05:00
parent 85131e6166
commit c0ecc6a329
2 changed files with 5 additions and 5 deletions

View File

@@ -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:

View File

@@ -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