tweaks to fix merge issues
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user