Compare commits

..

1 Commits

Author SHA1 Message Date
NoDRM
7379b45319 Remove future import from ion.py 2024-11-10 20:15:33 +01:00
2 changed files with 22 additions and 28 deletions

View File

@@ -379,18 +379,15 @@ elif isosx:
return None return None
def adeptkeys(): def adeptkeys():
# TODO: All the code to support extracting multiple activation keys
# TODO: seems to be Windows-only currently, still needs to be added for Mac.
actpath = findActivationDat() actpath = findActivationDat()
if actpath is None: if actpath is None:
raise ADEPTError("Could not find ADE activation.dat file.") raise ADEPTError("Could not find ADE activation.dat file.")
tree = etree.parse(actpath) tree = etree.parse(actpath)
adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag) adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
expr = '//%s/%s' % (adept('credentials'), adept('privateLicenseKey')) expr = '//%s/%s' % (adept('credentials'), adept('privateLicenseKey'))
userkeyelems = tree.findall(expr) userkey = tree.findtext(expr)
userkeys = []
keynames = []
for userkeyelem in userkeyelems:
userkey = userkeyelem.text
exprUUID = '//%s/%s' % (adept('credentials'), adept('user')) exprUUID = '//%s/%s' % (adept('credentials'), adept('user'))
keyName = "" keyName = ""
@@ -411,13 +408,11 @@ elif isosx:
else: else:
keyName = keyName[:-1] keyName = keyName[:-1]
userkey = b64decode(userkey) userkey = b64decode(userkey)
userkey = userkey[26:] userkey = userkey[26:]
return [userkey], [keyName]
userkeys.append(userkey)
keynames.append(keyName)
return userkeys, keynames
else: else:
def adeptkeys(): def adeptkeys():

View File

@@ -15,7 +15,6 @@ Revision history:
Copyright © 2013-2020 Apprentice Harper et al. Copyright © 2013-2020 Apprentice Harper et al.
""" """
from __future__ import annotations
import collections import collections
import hashlib import hashlib