Remove future import from ion.py

DeDRM_plugin/adobekey.py

@@ -379,45 +379,40 @@ elif isosx:
         return None
 
     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()
         if actpath is None:
             raise ADEPTError("Could not find ADE activation.dat file.")
         tree = etree.parse(actpath)
         adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
         expr = '//%s/%s' % (adept('credentials'), adept('privateLicenseKey'))
-        userkeyelems = tree.findall(expr)
+        userkey = tree.findtext(expr)
 
-        userkeys = []
+        exprUUID = '//%s/%s' % (adept('credentials'), adept('user'))
-        keynames = []
+        keyName = ""
-        for userkeyelem in userkeyelems:
+        try: 
-            userkey = userkeyelem.text
+            keyName = tree.findtext(exprUUID)[9:] + "_"
+        except: 
+            pass
 
-            exprUUID = '//%s/%s' % (adept('credentials'), adept('user'))
+        try: 
-            keyName = ""
+            exprMail = '//%s/%s' % (adept('credentials'), adept('username'))
-            try: 
+            keyName = keyName + tree.find(exprMail).attrib["method"] + "_"
-                keyName = tree.findtext(exprUUID)[9:] + "_"
+            keyName = keyName + tree.findtext(exprMail) + "_"
-            except: 
+        except:
-                pass
+            pass
 
-            try: 
+        if keyName == "":
-                exprMail = '//%s/%s' % (adept('credentials'), adept('username'))
+            keyName = "Unknown"
-                keyName = keyName + tree.find(exprMail).attrib["method"] + "_"
+        else:
-                keyName = keyName + tree.findtext(exprMail) + "_"
+            keyName = keyName[:-1]
-            except:
-                pass
 
-            if keyName == "":
-                keyName = "Unknown"
-            else:
-                keyName = keyName[:-1]
 
-            userkey = b64decode(userkey)
-            userkey = userkey[26:]
 
-            userkeys.append(userkey)
+        userkey = b64decode(userkey)
-            keynames.append(keyName)
+        userkey = userkey[26:]
-
+        return [userkey], [keyName]
-        return userkeys, keynames
 
 else:
     def adeptkeys():

DeDRM_plugin/ion.py

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