Skip to content

Commit 3908441

Browse files
Drops python 2.7 support, we should have done this before now anyway. This in a way closes #36
1 parent de54762 commit 3908441

File tree

3 files changed

+6
-21
lines changed

3 files changed

+6
-21
lines changed

addon/synthDrivers/_ibmeci.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66
from ctypes import *
77
from io import BytesIO
88
from os import path
9-
try:
10-
# Python 2.7 imports
11-
import Queue as queue
12-
except ImportError:
13-
# Python 3 import
14-
import queue
9+
import queue
1510

1611
import threading, time
1712
import config, languageHandler, nvwave, addonHandler

addon/synthDrivers/ibmeci.py

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,8 @@
1414
import addonHandler
1515
addonHandler.initTranslation()
1616

17-
try: # for python 2.7
18-
unicode
19-
from synthDriverHandler import BooleanSynthSetting as BooleanDriverSetting,NumericSynthSetting as NumericDriverSetting
20-
21-
class synthIndexReached:
22-
@classmethod
23-
def notify (cls, synth=None, index=None): pass
24-
synthDoneSpeaking = synthIndexReached
25-
except:
26-
from driverHandler import BooleanDriverSetting,NumericDriverSetting
27-
from synthDriverHandler import synthIndexReached, synthDoneSpeaking
28-
def unicode(s): return s
17+
from driverHandler import BooleanDriverSetting,NumericDriverSetting
18+
from synthDriverHandler import synthIndexReached, synthDoneSpeaking
2919

3020
minRate=40
3121
maxRate=156
@@ -190,7 +180,7 @@ def speak(self,speechSequence):
190180
charmode=False
191181
for item in speechSequence:
192182
if isinstance(item, string_types):
193-
s = self.processText(unicode(item))
183+
s = self.processText(item)
194184
outlist.append((_ibmeci.speak, (s,)))
195185
last = s
196186
elif isinstance(item,speech.IndexCommand):

buildVars.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
# Documentation file name
2828
"addon_docFileName" : "readme.html",
2929
# Minimum NVDA version supported (e.g. "2018.3.0")
30-
"addon_minimumNVDAVersion" : "2018.3.0",
30+
"addon_minimumNVDAVersion" : "2019.3.0",
3131
# Last NVDA version supported/tested (e.g. "2018.4.0", ideally more recent than minimum version)
32-
"addon_lastTestedNVDAVersion" : "2020.2.0",
32+
"addon_lastTestedNVDAVersion" : "2020.4.0",
3333
# Add-on update channel (default is stable or None)
3434
"addon_updateChannel" : None,
3535
}

0 commit comments

Comments
 (0)