From 49c9645b8a17d85db6d3e2d4935992865dd3dd18 Mon Sep 17 00:00:00 2001
From: chrys <chrys@linux-a11y.org>
Date: Sat, 2 Mar 2019 19:06:46 +0100
Subject: [PATCH] Revert "Update vcsaDriver.py"

This reverts commit 47bcaa425b567ec78a9fe9cfb449326140153e25.
---
 .../screenDriver/vcsaDriver.py                   | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/fenrirscreenreader/screenDriver/vcsaDriver.py b/src/fenrirscreenreader/screenDriver/vcsaDriver.py
index 9150dfb4..85a9f932 100644
--- a/src/fenrirscreenreader/screenDriver/vcsaDriver.py
+++ b/src/fenrirscreenreader/screenDriver/vcsaDriver.py
@@ -123,15 +123,12 @@ class driver(screenDriver):
                             try:
                                 watchdog.unregister(vcsa[ oldScreen ])              
                             except:
-                                print('watchdog.unregister: '+  str(e))                                
+                                pass
                             try:
                                 watchdog.register(vcsa[ currScreen ], select.POLLPRI | select.POLLERR) 
-                            except Exception as e:
-                                print('watchdog.register: '+  str(e))                                
-                            try:
-                                self.updateCharMap(currScreen)                            
-                            except Exception as e:
-                                print('updateCharMap: '+  str(e))                                      
+                            except:
+                                pass
+                            self.updateCharMap(currScreen)                            
                             oldScreen = currScreen
                             try:
                                 vcsa[currScreen].seek(0)                        
@@ -147,7 +144,6 @@ class driver(screenDriver):
                         dirtyContent = vcsa[currScreen].read()
                         screenContent = b''
                         timeout = time.time()
-                        print('dirty ' + str(currScreen))
                         while screenContent != dirtyContent:
                             screenContent = dirtyContent
                             if time.time() - timeout >= 0.4:
@@ -198,10 +194,8 @@ class driver(screenDriver):
                 unipairs = array("H", [0]*(2*sz))
                 unimapdesc = array("B", pack("@HP", sz, unipairs.buffer_info()[0]))
                 ioctl(tty.fileno(), GIO_UNIMAP, unimapdesc)
-                print('updateCharMap sz good')                                        
                 break
             except Exception as e:
-                print('updateCharMap sz wrong: ' + str(e))                        
                 self.env['runtime']['debug'].writeDebugOut('VCSA:updateCharMap:scaling up sz=' + str(sz) + ' ' + str(e),debug.debugLevel.WARNING)   
                 sz *= 2
         tty.close()
@@ -210,13 +204,11 @@ class driver(screenDriver):
         for u, b in zip(utable[::2], utable[1::2]):
             if self.charmap.get(b) is None:
                 self.charmap[b] = chr(u)
-        print('charmap ' + str(self.charmap[b])) 
 
     def autoDecodeVCSA(self, allData, rows, cols):
         allText = ''
         allAttrib = []
         i = 0
-        print('autoDecodeVCSA start')                                
         for y in range(rows):
             lineText = ''
             lineAttrib = []