Merge pull request #1291 from karpierz/PY3_compatibility_improvement_1

PY3 compatibility simplification and little improvement.  [Please add to TODO]

Author: guedou

scapy/automaton.py

@@ -23,13 +23,6 @@
 from scapy.compat import *
 import scapy.modules.six as six
 
-try:
-    import thread
-except ImportError:
-    THREAD_EXCEPTION = RuntimeError
-else:
-    THREAD_EXCEPTION = thread.error
-
 if WINDOWS:
     from scapy.error import Scapy_Exception
     recv_error = Scapy_Exception
@@ -107,7 +100,7 @@ def call_release(self, arborted=False):
         self.was_ended = arborted
         try:
             self.trigger.release()
-        except (THREAD_EXCEPTION, AttributeError):
+        except (threading.ThreadError, AttributeError):
             pass
 
 class SelectableSelector(object):