From 6b6de57c9ec26fa2af30d8cfd93382be75da579b Mon Sep 17 00:00:00 2001
From: Chrys <chrys@linux-a11y.org>
Date: Thu, 29 Aug 2019 17:52:57 +0200
Subject: [PATCH] Revert "replace replace by sub"

This reverts commit 7f91223f945b8376340aed9f444ae1109d134235.
---
 .../core/punctuationManager.py                |  9 +++--
 .../screenDriver/ptyDriver.py                 | 38 ++++++-------------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/src/fenrirscreenreader/core/punctuationManager.py b/src/fenrirscreenreader/core/punctuationManager.py
index 095b8506..a98577ea 100644
--- a/src/fenrirscreenreader/core/punctuationManager.py
+++ b/src/fenrirscreenreader/core/punctuationManager.py
@@ -33,14 +33,15 @@ class punctuationManager():
                 del currAllPunctNone[ord(char)]
             except:
                 pass
-        return text.translate(currAllPunctNone)
+        return text.translate(currAllPunctNone)   
+    
     def useCustomDict(self, text, customDict, seperator=''):
         resultText = str(text)
         if customDict:
             for key,item in customDict.items():
-                #resultText = resultText.replace(str(key),seperator + str(item) + seperator)
-                resultText = re.sub(str(key), str(item), resultText)
+                resultText = resultText.replace(str(key),seperator + str(item) + seperator)
         return resultText
+    
     def usePunctuationDict(self, text, punctuationDict, punctuation):
         resultText = str(text)
 
@@ -52,7 +53,7 @@ class punctuationManager():
                     if self.env['runtime']['settingsManager'].getSetting('general', 'respectPunctuationPause') and \
                       len(key) == 1 and \
                       key in "',.;:?!":
-                        resultText = resultText.replace(str(key),' ' +str(item) + str(key) + ' ')
+                        resultText = resultText.replace(str(key),' ' +str(item) + str(key) + ' ')                    
                     else:
                         resultText = resultText.replace(str(key),' ' +str(item) + ' ')
         return resultText
diff --git a/src/fenrirscreenreader/screenDriver/ptyDriver.py b/src/fenrirscreenreader/screenDriver/ptyDriver.py
index 388083a6..7f0ced69 100644
--- a/src/fenrirscreenreader/screenDriver/ptyDriver.py
+++ b/src/fenrirscreenreader/screenDriver/ptyDriver.py
@@ -87,13 +87,6 @@ class driver(screenDriver):
         self.env = environment
         self.command = self.env['runtime']['settingsManager'].getSetting('general','shell')
         self.shortcutType = self.env['runtime']['inputManager'].getShortcutType()
-        param = [sys.stdin.fileno(), sys.stdout.fileno(), self.signalPipe, self.p_out, self.p_pid]
-        #param[0] = sys.stdin
-        #param[1] = sys.stdout
-        #param[2] = self.signalPipe
-        #param[3] = self.p_out
-        #param[4] = self.p_pid
-        self.env['runtime']['processManager'].addCustomEventThread(self.terminalEmulation, pargs = param, multiprocess = False)
         self.env['runtime']['processManager'].addCustomEventThread(self.terminalEmulation)
     def getCurrScreen(self):
         self.env['screen']['oldTTY'] = 'pty'
@@ -160,26 +153,17 @@ class driver(screenDriver):
         return lines, columns
     def handleSigwinch(self, *args):
         os.write(self.signalPipe[1], b'w')
-    def terminalEmulation(self,active , eventQueue, param = None):
-        try:
-            #stdin = param[0]
-            stdin = os.fdopen(param[0])
-            stdout = os.fdopen(param[1])
-            signalPipe = param[2]
-            p_outFd = param[3]
-            p_pid = param[4]
-            old_attr = termios.tcgetattr(stdin)
-            tty.setraw(0)
-            lines, columns = self.getTerminalSize(0)
-            if self.command == '':
-                self.command = screen_utils.getShell()
-            terminal, p_pid.value, fd = self.openTerminal(columns, lines, self.command)
-            p_outFd.value = os.dup(fd)
-            p_out = fd
-            #p_out = os.fdopen(p_outFd.value, "r+b", 0)
-            lines, columns = self.resizeTerminal(p_out)
-            terminal.resize(lines, columns)
-            fdList = [stdin, p_out, signalPipe[0]]
+    def terminalEmulation(self,active , eventQueue):
+        try:
+            old_attr = termios.tcgetattr(sys.stdin)
+            tty.setraw(0)
+            lines, columns = self.getTerminalSize(0)
+            if self.command == '':
+                self.command = screen_utils.getShell()
+            self.terminal, self.p_pid, self.p_out = self.openTerminal(columns, lines, self.command)
+            lines, columns = self.resizeTerminal(self.p_out)
+            self.terminal.resize(lines, columns)
+            fdList = [sys.stdin, self.p_out, self.signalPipe[0]]
             while active.value:
                 r, _, _ = select(fdList, [], [], 1)
                 # none