From f1199035f6ac8c2bc90e97603cc0d3e703ae168d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 10 Jun 2019 15:41:30 +0530 Subject: [PATCH] py3: Port winreg imports --- src/calibre/devices/winusb.py | 8 +++++++- src/calibre/utils/winreg/lib.py | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/winusb.py b/src/calibre/devices/winusb.py index 93b5e89dd0..9ecfa32d20 100644 --- a/src/calibre/devices/winusb.py +++ b/src/calibre/devices/winusb.py @@ -4,7 +4,7 @@ from __future__ import absolute_import, division, print_function, unicode_literals -import os, string, _winreg as winreg, re, sys +import os, string, re, sys from collections import namedtuple, defaultdict from operator import itemgetter from ctypes import ( @@ -20,6 +20,12 @@ from calibre import prints, as_unicode is64bit = sys.maxsize > (1 << 32) +try: + import winreg +except ImportError: + import _winreg as winreg + + # Data and function type definitions {{{ diff --git a/src/calibre/utils/winreg/lib.py b/src/calibre/utils/winreg/lib.py index 14488dc4e3..f96ecd630d 100644 --- a/src/calibre/utils/winreg/lib.py +++ b/src/calibre/utils/winreg/lib.py @@ -5,9 +5,15 @@ from __future__ import absolute_import, division, print_function, unicode_litera __license__ = 'GPL v3' __copyright__ = '2015, Kovid Goyal ' -import ctypes, ctypes.wintypes as types, _winreg as winreg, struct, datetime, numbers +import ctypes, ctypes.wintypes as types, struct, datetime, numbers import winerror, win32con +try: + import winreg +except ImportError: + import _winreg as winreg + + # Binding to C library {{{ advapi32 = ctypes.windll.advapi32 HKEY = types.HKEY