net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36

--- a/preludecorrelator/config.py
+++ b/preludecorrelator/config.py
@@ -19,7 +19,11 @@
 
 import os
 import glob
-import StringIO
+import sys
+if sys.version_info >= (3, 0):
+    from io import StringIO
+else:
+    import StringIO
 try:
     import configparser
 except:
@@ -77,5 +81,8 @@
                 f = open(fname, 'r')
             except IOError:
                 continue
-            self.readfp(StringIO.StringIO('[prelude]\n' + f.read()))
+            if sys.version_info >= (3, 0):
+                self.readfp(StringIO('[prelude]\n' + f.read()))
+            else:
+                self.readfp(StringIO.StringIO('[prelude]\n' + f.read()))
             f.close()
--- a/preludecorrelator/context.py
+++ b/preludecorrelator/context.py
@@ -362,7 +362,7 @@
 
         try:
             _CONTEXT_TABLE.update(ContextUnpickler(fd).load())
-        except EOFError:
+        except:
             return
 
         logger.debug("[load]: %d context loaded", len(_CONTEXT_TABLE))