Mirrors
/
DeDRM_tools
mirror of https://github.com/noDRM/DeDRM_tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

_winreg in python3 has been changed to winreg. Update imports.

This commit is contained in:
Jeremy Whiting 2020-10-21 10:43:54 -06:00
parent c4c20eb07e
commit 0add3646d9
9 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DeDRM_plugin/ignoblekey.py
View File

@ -95,7 +95,7 @@ def getNookLogFiles():
logFiles = [] logFiles = []
found = False found = False
if iswindows: if iswindows:
import _winreg as winreg import winreg
# some 64 bit machines do not have the proper registry key for some reason # some 64 bit machines do not have the proper registry key for some reason
# or the python interface to the 32 vs 64 bit registry is broken # or the python interface to the 32 vs 64 bit registry is broken

1
DeDRM_plugin/kindlekey.py
View File

@ -190,7 +190,6 @@ if iswindows:
create_unicode_buffer, create_string_buffer, CFUNCTYPE, addressof, \ create_unicode_buffer, create_string_buffer, CFUNCTYPE, addressof, \
string_at, Structure, c_void_p, cast string_at, Structure, c_void_p, cast
# import _winreg as winreg
import winreg import winreg
MAX_PATH = 255 MAX_PATH = 255
kernel32 = windll.kernel32 kernel32 = windll.kernel32

2
DeDRM_plugin/simpleprefs.py
View File

@ -20,7 +20,7 @@ class SimplePrefs(object):
self.file2key[filename] = key self.file2key[filename] = key
self.target = target + 'Prefs' self.target = target + 'Prefs'
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
import _winreg as winreg import winreg
regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\") regkey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders\\")
path = winreg.QueryValueEx(regkey, 'Local AppData')[0] path = winreg.QueryValueEx(regkey, 'Local AppData')[0]
prefdir = path + os.sep + self.target prefdir = path + os.sep + self.target

8
Obok_plugin/obok/legacy_obok.py
View File

@ -37,14 +37,14 @@ class legacy_obok(object):
def __oldcookiedeviceid(self): def __oldcookiedeviceid(self):
'''Optionally attempt to get a device id using the old cookie method. '''Optionally attempt to get a device id using the old cookie method.
Must have _winreg installed on Windows machines for successful key retrieval.''' Must have winreg installed on Windows machines for successful key retrieval.'''
wsuid = '' wsuid = ''
pwsdid = '' pwsdid = ''
try: try:
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
import _winreg import winreg
regkey_browser = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, 'Software\\Kobo\\Kobo Desktop Edition\\Browser') regkey_browser = winreg.OpenKey(winreg.HKEY_CURRENT_USER, 'Software\\Kobo\\Kobo Desktop Edition\\Browser')
cookies = _winreg.QueryValueEx(regkey_browser, 'cookies') cookies = winreg.QueryValueEx(regkey_browser, 'cookies')
bytearrays = cookies[0] bytearrays = cookies[0]
elif sys.platform.startswith('darwin'): elif sys.platform.startswith('darwin'):
prefs = os.path.join(os.environ['HOME'], 'Library/Preferences/com.kobo.Kobo Desktop Edition.plist') prefs = os.path.join(os.environ['HOME'], 'Library/Preferences/com.kobo.Kobo Desktop Edition.plist')

2
Other_Tools/DRM_Key_Scripts/Adobe_Digital_Editions/adobekey.pyw
View File

@ -129,7 +129,7 @@ if iswindows:
c_long, c_ulong c_long, c_ulong
from ctypes.wintypes import LPVOID, DWORD, BOOL from ctypes.wintypes import LPVOID, DWORD, BOOL
import _winreg as winreg import winreg
def _load_crypto_libcrypto(): def _load_crypto_libcrypto():
from ctypes.util import find_library from ctypes.util import find_library

2
Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw
View File

@ -98,7 +98,7 @@ def getNookLogFiles():
logFiles = [] logFiles = []
found = False found = False
if iswindows: if iswindows:
import _winreg as winreg import winreg
# some 64 bit machines do not have the proper registry key for some reason # some 64 bit machines do not have the proper registry key for some reason
# or the python interface to the 32 vs 64 bit registry is broken # or the python interface to the 32 vs 64 bit registry is broken

2
Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
View File

@ -177,7 +177,7 @@ if iswindows:
create_unicode_buffer, create_string_buffer, CFUNCTYPE, addressof, \ create_unicode_buffer, create_string_buffer, CFUNCTYPE, addressof, \
string_at, Structure, c_void_p, cast string_at, Structure, c_void_p, cast
import _winreg as winreg import winreg
MAX_PATH = 255 MAX_PATH = 255
kernel32 = windll.kernel32 kernel32 = windll.kernel32
advapi32 = windll.advapi32 advapi32 = windll.advapi32

2
Other_Tools/Kobo/obok.py
View File

@ -346,7 +346,7 @@ class KoboLibrary(object):
if (self.kobodir == u""): if (self.kobodir == u""):
# step 4. we haven't found a device with serials, so try desktop apps # step 4. we haven't found a device with serials, so try desktop apps
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
import _winreg as winreg import winreg
if sys.getwindowsversion().major > 5: if sys.getwindowsversion().major > 5:
if 'LOCALAPPDATA' in os.environ.keys(): if 'LOCALAPPDATA' in os.environ.keys():
# Python 2.x does not return unicode env. Use Python 3.x # Python 2.x does not return unicode env. Use Python 3.x

2
Other_Tools/Tetrachroma_FileOpen_ineptpdf/ineptpdf_8.4.51.pyw
View File

@ -2290,7 +2290,7 @@ class PDFDocument(object):
import win32api import win32api
import win32security import win32security
import win32file import win32file
import _winreg as winreg import winreg
except: except:
raise ADEPTError('PyWin Extension (Win32API module) needed.\n'+\ raise ADEPTError('PyWin Extension (Win32API module) needed.\n'+\
'Download from http://sourceforge.net/projects/pywin32/files/ ') 'Download from http://sourceforge.net/projects/pywin32/files/ ')