diff --git a/source/JABHandler.py b/source/JABHandler.py index cf68eb3fb40..d0562b82c42 100644 --- a/source/JABHandler.py +++ b/source/JABHandler.py @@ -1,14 +1,11 @@ # -*- coding: UTF-8 -*- #javaAccessBridgeHandler.py #A part of NonVisual Desktop Access (NVDA) -#Copyright (C) 2007-2017 NV Access Limited, Peter Vágner, Renaud Paquay, Babbage B.V. +#Copyright (C) 2007-2018 NV Access Limited, Peter Vágner, Renaud Paquay, Babbage B.V. #This file is covered by the GNU General Public License. #See the file COPYING for more details. -try: - import Queue as queue # Python 2.7 import -except ImportError: - import queue # Python 3 import +import queue from ctypes import * from ctypes.wintypes import * import time diff --git a/source/NVDAHelper.py b/source/NVDAHelper.py index 7e6e9fa8195..22ca5f725a0 100755 --- a/source/NVDAHelper.py +++ b/source/NVDAHelper.py @@ -6,10 +6,7 @@ import os import sys -try: - import _winreg as winreg # Python 2.7 import -except ImportError: - import winreg # Python 3 import +import winreg import msvcrt import versionInfo import winKernel diff --git a/source/brailleDisplayDrivers/baum.py b/source/brailleDisplayDrivers/baum.py index bb53f400653..24e3c6e27e7 100644 --- a/source/brailleDisplayDrivers/baum.py +++ b/source/brailleDisplayDrivers/baum.py @@ -7,7 +7,7 @@ import time from collections import OrderedDict -from cStringIO import StringIO +from io import StringIO import braille import inputCore from logHandler import log diff --git a/source/brailleDisplayDrivers/eurobraille.py b/source/brailleDisplayDrivers/eurobraille.py index 86960057732..393b6705de5 100644 --- a/source/brailleDisplayDrivers/eurobraille.py +++ b/source/brailleDisplayDrivers/eurobraille.py @@ -6,7 +6,7 @@ #Copyright (C) 2017-2019 NV Access Limited, Babbage B.V., Eurobraille from collections import OrderedDict, defaultdict -from cStringIO import StringIO +from io import StringIO import serial import bdDetect import braille diff --git a/source/brailleDisplayDrivers/handyTech.py b/source/brailleDisplayDrivers/handyTech.py index 460c957f314..78eba924e56 100644 --- a/source/brailleDisplayDrivers/handyTech.py +++ b/source/brailleDisplayDrivers/handyTech.py @@ -10,7 +10,7 @@ """ from collections import OrderedDict -from cStringIO import StringIO +from io import StringIO import serial # pylint: disable=E0401 import weakref import hwIo diff --git a/source/brailleDisplayDrivers/hims.py b/source/brailleDisplayDrivers/hims.py index 6914544ea43..cd36289bc2f 100644 --- a/source/brailleDisplayDrivers/hims.py +++ b/source/brailleDisplayDrivers/hims.py @@ -6,7 +6,7 @@ #Copyright (C) 2010-2018 Gianluca Casalino, NV Access Limited, Babbage B.V., Leonard de Ruijter, Bram Duvigneau import serial -from cStringIO import StringIO +from io import StringIO import os import hwIo import braille diff --git a/source/brailleDisplayDrivers/papenmeier.py b/source/brailleDisplayDrivers/papenmeier.py index f8bbc4fd45b..880ee4138de 100644 --- a/source/brailleDisplayDrivers/papenmeier.py +++ b/source/brailleDisplayDrivers/papenmeier.py @@ -27,10 +27,7 @@ #for brxcom import ctypes as c -try: - import _winreg as winreg # Python 2.7 import -except ImportError: - import winreg # Python 3 import +import winreg import winUser #for scripting diff --git a/source/config/__init__.py b/source/config/__init__.py index 0e77ec85eb1..2908fd7c712 100644 --- a/source/config/__init__.py +++ b/source/config/__init__.py @@ -12,15 +12,12 @@ """ import globalVars -try: - import _winreg as winreg # Python 2.7 import -except ImportError: - import winreg # Python 3 import +import winreg import ctypes import ctypes.wintypes import os import sys -from cStringIO import StringIO +from io import StringIO import itertools import contextlib from copy import deepcopy diff --git a/source/config/configSpec.py b/source/config/configSpec.py index fdc4e0114b5..ab9c894269b 100644 --- a/source/config/configSpec.py +++ b/source/config/configSpec.py @@ -4,7 +4,7 @@ #This file is covered by the GNU General Public License. #See the file COPYING for more details. -from cStringIO import StringIO +from io import StringIO from configobj import ConfigObj #: The version of the schema outlined in this file. Increment this when modifying the schema and diff --git a/source/easeOfAccess.py b/source/easeOfAccess.py index 5efcc212415..ba4729c5271 100644 --- a/source/easeOfAccess.py +++ b/source/easeOfAccess.py @@ -7,10 +7,7 @@ """Utilities for working with the Windows Ease of Access Center. """ -try: - import _winreg as winreg # Python 2.7 import -except ImportError: - import winreg # Python 3 import +import winreg import ctypes import winUser from winVersion import winVersion diff --git a/source/gui/nvdaControls.py b/source/gui/nvdaControls.py index 82e5ef44a18..321223b9a50 100644 --- a/source/gui/nvdaControls.py +++ b/source/gui/nvdaControls.py @@ -11,12 +11,7 @@ import oleacc import winUser import winsound -try: - # Python 3 import - from collections.abc import Callable -except ImportError: - # Python 2 import - from collections import Callable +from collections.abc import Callable class AutoWidthColumnListCtrl(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin): """ diff --git a/source/hwPortUtils.py b/source/hwPortUtils.py index 9d723a4a61d..f2c5e5f1769 100644 --- a/source/hwPortUtils.py +++ b/source/hwPortUtils.py @@ -9,10 +9,7 @@ import itertools import ctypes from ctypes.wintypes import BOOL, WCHAR, HWND, DWORD, ULONG, WORD, USHORT -try: - import _winreg as winreg # Python 2.7 import -except ImportError: - import winreg # Python 3 import +import winreg import winKernel from winKernel import SYSTEMTIME import config diff --git a/source/installer.py b/source/installer.py index 0148f5f54b7..9fea0f9546c 100644 --- a/source/installer.py +++ b/source/installer.py @@ -6,10 +6,7 @@ from ctypes import * from ctypes.wintypes import * -try: - import _winreg as winreg # Python 2.7 import -except ImportError: - import winreg # Python 3 import +import winreg import threading import time import os diff --git a/source/languageHandler.py b/source/languageHandler.py index e3ec22791d6..8f606d4c3af 100644 --- a/source/languageHandler.py +++ b/source/languageHandler.py @@ -8,7 +8,7 @@ This module assists in NVDA going global through language services such as converting Windows locale ID's to friendly names and presenting available languages. """ -import __builtin__ +import builtins import os import sys import ctypes diff --git a/source/mathType.py b/source/mathType.py index b6052b6f96e..6cd5b7efbc8 100644 --- a/source/mathType.py +++ b/source/mathType.py @@ -7,10 +7,7 @@ """Utilities for working with MathType. """ -try: - import _winreg as winreg # Python 2.7 import -except ImportError: - import winreg # Python 3 import +import winreg import ctypes import mathPres diff --git a/source/nvda.pyw b/source/nvda.pyw index 7fbcb4db104..6fd8b66c7f2 100755 --- a/source/nvda.pyw +++ b/source/nvda.pyw @@ -177,10 +177,7 @@ if not mutex or ctypes.windll.kernel32.GetLastError()==ERROR_ALREADY_EXISTS: isSecureDesktop = desktopName == "Winlogon" if isSecureDesktop: - try: - import _winreg as winreg # Python 2.7 import - except ImportError: - import winreg # Python 3 import + import winreg try: k = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, ur"SOFTWARE\NVDA") if not winreg.QueryValueEx(k, u"serviceDebug")[0]: diff --git a/source/pythonConsole.py b/source/pythonConsole.py index 58ac011f3c2..bfb7cd1b54d 100755 --- a/source/pythonConsole.py +++ b/source/pythonConsole.py @@ -10,7 +10,7 @@ To use, call L{initialize} to create a singleton instance of the console GUI. This can then be accessed externally as L{consoleUI}. """ -import __builtin__ +import builtins import os import code import sys diff --git a/source/queueHandler.py b/source/queueHandler.py index 1fce3f6c63a..74d2de709c7 100644 --- a/source/queueHandler.py +++ b/source/queueHandler.py @@ -5,10 +5,7 @@ #See the file COPYING for more details. import types -try: - from Queue import Queue # Python 2.7 import -except ImportError: - from queue import Queue # Python 3 import +from queue import Queue import globalVars from logHandler import log import watchdog diff --git a/source/synthDrivers/_espeak.py b/source/synthDrivers/_espeak.py index 7f0233dbbca..b63977a1898 100755 --- a/source/synthDrivers/_espeak.py +++ b/source/synthDrivers/_espeak.py @@ -8,10 +8,7 @@ import time import nvwave import threading -try: - import Queue as queue # Python 2.7 import -except ImportError: - import queue # Python 3 import +import queue from ctypes import * import config import globalVars diff --git a/source/synthDrivers/espeak.py b/source/synthDrivers/espeak.py index 6ac4072e08d..a72a7c950e1 100644 --- a/source/synthDrivers/espeak.py +++ b/source/synthDrivers/espeak.py @@ -8,7 +8,6 @@ import os from collections import OrderedDict from . import _espeak -import Queue import threading import languageHandler from synthDriverHandler import SynthDriver, VoiceInfo, synthIndexReached, synthDoneSpeaking diff --git a/source/synthDrivers/oneCore.py b/source/synthDrivers/oneCore.py index 00abc654b6f..11894bef05f 100644 --- a/source/synthDrivers/oneCore.py +++ b/source/synthDrivers/oneCore.py @@ -11,13 +11,10 @@ import sys from collections import OrderedDict import ctypes -try: - import _winreg as winreg # Python 2.7 import -except ImportError: - import winreg # Python 3 import +import winreg import wave -import cStringIO from synthDriverHandler import SynthDriver, VoiceInfo, synthIndexReached, synthDoneSpeaking +import io from logHandler import log import config import nvwave @@ -329,7 +326,7 @@ def _callback(self, bytes, len, markers): self._processQueue() return # This gets called in a background thread. - stream = cStringIO.StringIO(ctypes.string_at(bytes, len)) + stream = io.BytesIO(ctypes.string_at(bytes, len)) wav = wave.open(stream, "r") self._maybeInitPlayer(wav) data = wav.readframes(wav.getnframes()) diff --git a/source/synthDrivers/sapi4.py b/source/synthDrivers/sapi4.py index 20c1e395306..4e75af9b783 100755 --- a/source/synthDrivers/sapi4.py +++ b/source/synthDrivers/sapi4.py @@ -6,10 +6,7 @@ import locale from collections import OrderedDict -try: - import _winreg as winreg # Python 2.7 import -except ImportError: - import winreg # Python 3 import +import winreg from comtypes import COMObject, COMError from ctypes import * from synthDriverHandler import SynthDriver,VoiceInfo, synthIndexReached, synthDoneSpeaking diff --git a/source/synthDrivers/sapi5.py b/source/synthDrivers/sapi5.py index ce526d94b9b..d183007742b 100644 --- a/source/synthDrivers/sapi5.py +++ b/source/synthDrivers/sapi5.py @@ -13,10 +13,7 @@ from ctypes import * import comtypes.client from comtypes import COMError -try: - import _winreg as winreg # Python 2.7 import -except ImportError: - import winreg # Python 3 import +import winreg import audioDucking import NVDAHelper import globalVars