diff options
author | Derek Tracy <[email protected]> | 2021-02-24 20:54:39 -0500 |
---|---|---|
committer | NoDRM <[email protected]> | 2021-11-16 21:22:13 +0100 |
commit | 1545d76803da31873e3dd956b34776ca37874c36 (patch) | |
tree | 59d2246770c638e64ca753beee37cec9ba7f42fd /Obok_plugin | |
parent | d9353bdd9372f607d9ab8a8059ee4469541406a8 (diff) |
Support Python 2.7 and Python 3 winreg imports on Windows
Diffstat (limited to 'Obok_plugin')
-rw-r--r-- | Obok_plugin/obok/legacy_obok.py | 5 | ||||
-rw-r--r-- | Obok_plugin/obok/obok.py | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Obok_plugin/obok/legacy_obok.py b/Obok_plugin/obok/legacy_obok.py index caf24f2..9a9ae5d 100644 --- a/Obok_plugin/obok/legacy_obok.py +++ b/Obok_plugin/obok/legacy_obok.py @@ -42,7 +42,10 @@ class legacy_obok(object): pwsdid = '' try: if sys.platform.startswith('win'): - import winreg + try: + import winreg + except ImportError: + import _winreg as winreg regkey_browser = winreg.OpenKey(winreg.HKEY_CURRENT_USER, 'Software\\Kobo\\Kobo Desktop Edition\\Browser') cookies = winreg.QueryValueEx(regkey_browser, 'cookies') bytearrays = cookies[0] diff --git a/Obok_plugin/obok/obok.py b/Obok_plugin/obok/obok.py index ae8ff89..f680341 100644 --- a/Obok_plugin/obok/obok.py +++ b/Obok_plugin/obok/obok.py @@ -360,7 +360,10 @@ class KoboLibrary(object): if (self.kobodir == u""): if sys.platform.startswith('win'): - import winreg + try: + import winreg + except ImportError: + import _winreg as winreg if sys.getwindowsversion().major > 5: if 'LOCALAPPDATA' in os.environ.keys(): # Python 2.x does not return unicode env. Use Python 3.x |