import Python 3 native modules

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

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

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

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

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

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

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

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

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 

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

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):
 	"""

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

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

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

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
 

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]:

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

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

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

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

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())

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

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