Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3: Port winreg imports

Browse Source
This commit is contained in:
Kovid Goyal 2019-06-10 15:41:30 +05:30
parent 549b822f9c
commit f1199035f6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/devices/winusb.py
View File

@ -4,7 +4,7 @@
from __future__ import absolute_import, division, print_function, unicode_literals 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 collections import namedtuple, defaultdict
from operator import itemgetter from operator import itemgetter
from ctypes import ( from ctypes import (
@ -20,6 +20,12 @@ from calibre import prints, as_unicode
is64bit = sys.maxsize > (1 << 32) is64bit = sys.maxsize > (1 << 32)
try:
import winreg
except ImportError:
import _winreg as winreg
# Data and function type definitions {{{ # Data and function type definitions {{{

8
src/calibre/utils/winreg/lib.py
View File

@ -5,9 +5,15 @@ from __future__ import absolute_import, division, print_function, unicode_litera
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
import ctypes, ctypes.wintypes as types, _winreg as winreg, struct, datetime, numbers import ctypes, ctypes.wintypes as types, struct, datetime, numbers
import winerror, win32con import winerror, win32con
try:
import winreg
except ImportError:
import _winreg as winreg
# Binding to C library {{{ # Binding to C library {{{
advapi32 = ctypes.windll.advapi32 advapi32 = ctypes.windll.advapi32
HKEY = types.HKEY HKEY = types.HKEY