code style

Author: native-api

Lib/tkinter/test/test_tkinter/test_threads.py

@@ -7,16 +7,18 @@
 import time
 
 import unittest
+
+
 class TestThreads(unittest.TestCase):
     def test_threads(self):
         import subprocess
         p = subprocess.Popen([sys.executable, __file__, "run"],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE)
+                             stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE)
         self.addCleanup(p.stdout.close)
         self.addCleanup(p.stderr.close)
         try:
-            #Test code is designed to complete in a few seconds
+            # Test code is designed to complete in a few seconds
             stdout, stderr = p.communicate(timeout=10)
         except subprocess.TimeoutExpired:
             p.kill()
@@ -28,60 +30,69 @@ def test_threads(self):
         self.assertTrue(len(stderr) == 0, "stderr: " + repr(stderr))
 
 
-
 running = True
 
+
 class EventThread(threading.Thread):
-    def __init__(self,target):
-        super(EventThread,self).__init__()
+    def __init__(self, target):
+        super(EventThread, self).__init__()
         self.target = target
+
     def run(self):
         while running:
             time.sleep(0.02)
             c = random.choice(string.ascii_letters)
             self.target.event_generate(c)
 
+
 class Main(object):
     def __init__(self):
         self.root = tkinter.Tk()
-        self.root.bind('<Key>',dummy_handler)
-        self.threads=[]
+        self.root.bind('<Key>', dummy_handler)
+        self.threads = []
 
         self.t_cleanup = threading.Thread(target=self.tf_stop)
 
     def go(self):
-        self.root.after(0,self.add_threads)
-        self.root.after(500,self.stop)
-        self.root.protocol("WM_DELETE_WINDOW",self.stop)
+        self.root.after(0, self.add_threads)
+        self.root.after(500, self.stop)
+        self.root.protocol("WM_DELETE_WINDOW", self.stop)
         self.root.mainloop()
         self.t_cleanup.join()
+
     def stop(self):
         self.t_cleanup.start()
+
     def tf_stop(self):
         global running
         running = False
         for t in self.threads: t.join()
-        self.root.after(0,self.root.destroy)
+        self.root.after(0, self.root.destroy)
+
     def add_threads(self):
         for _ in range(20):
             t = EventThread(self.root)
             self.threads.append(t)
             t.start()
 
+
 def dummy_handler(event):
     pass
 
 
 tests_gui = (TestThreads,)
 
-if __name__=='__main__':
-    import sys,os
-    if sys.argv[1:]==['run']:
+if __name__ == '__main__':
+    import sys, os
+
+    if sys.argv[1:] == ['run']:
         if os.name == 'nt':
             import ctypes
-            #the bug causes crashes
+
+            # the bug causes crashes
             ctypes.windll.kernel32.SetErrorMode(3)
         Main().go()
     else:
         from test.support import run_unittest
+
         run_unittest(*tests_gui)

Modules/_tkinter.c

@@ -234,25 +234,25 @@ static PyThreadState *tcl_tstate = NULL;
 
 
 #define ACQUIRE_TCL_LOCK \
-if (tcl_lock) {\
+if (tcl_lock) { \
     if (tcl_lock_thread_ident == PyThread_get_thread_ident()) { \
         tcl_lock_reentry_count++; \
         if(!tcl_lock_reentry_count) \
             Py_FatalError("Tcl lock reentry count overflow"); \
     } else { \
         PyThread_acquire_lock(tcl_lock, 1); \
         tcl_lock_thread_ident = PyThread_get_thread_ident(); \
-    }\
+    } \
 }
 
 #define RELEASE_TCL_LOCK \
-if (tcl_lock){\
+if (tcl_lock) { \
     if (tcl_lock_reentry_count) { \
         tcl_lock_reentry_count--; \
     } else { \
         tcl_lock_thread_ident = 0; \
         PyThread_release_lock(tcl_lock); \
-    }\
+    } \
 }
 
 
@@ -261,18 +261,19 @@ if (tcl_lock){\
         ENTER_TCL_CUSTOM_TSTATE(tstate)
 
 #define ENTER_TCL_CUSTOM_TSTATE(tstate) \
-        Py_BEGIN_ALLOW_THREADS \
-        ACQUIRE_TCL_LOCK; tcl_tstate = tstate;
+    Py_BEGIN_ALLOW_THREADS \
+    ACQUIRE_TCL_LOCK \
+    tcl_tstate = tstate;
 
 #define LEAVE_TCL \
     tcl_tstate = NULL; \
     RELEASE_TCL_LOCK; Py_END_ALLOW_THREADS}
 
 #define LEAVE_TCL_WITH_BUSYWAIT(result) \
     tcl_tstate = NULL; \
-    RELEASE_TCL_LOCK;\
-    if (result == 0)\
-        Sleep(Tkinter_busywaitinterval);\
+    RELEASE_TCL_LOCK \
+    if (result == 0) \
+        Sleep(Tkinter_busywaitinterval); \
     Py_END_ALLOW_THREADS
 
 
@@ -283,7 +284,7 @@ if (tcl_lock){\
     Py_BEGIN_ALLOW_THREADS
 
 #define LEAVE_OVERLAP_TCL \
-    tcl_tstate = NULL; RELEASE_TCL_LOCK; }
+    tcl_tstate = NULL; RELEASE_TCL_LOCK }
 
 #define ENTER_PYTHON \
 { PyThreadState *tstate = tcl_tstate; tcl_tstate = NULL; PyEval_RestoreThread((tstate)); }
@@ -1844,7 +1845,7 @@ SetVar(PyObject *self, PyObject *args, int flags)
         if (newval) {
             LEAVE_OVERLAP
             ok = Tcl_SetVar2Ex(Tkapp_Interp(self), name1, NULL,
-            newval, flags);
+                               newval, flags);
             ENTER_OVERLAP
             if (!ok)
                 Tkinter_Error(self);
@@ -1867,7 +1868,7 @@ SetVar(PyObject *self, PyObject *args, int flags)
         if (newval) {
             LEAVE_OVERLAP
             ok = Tcl_SetVar2Ex(Tkapp_Interp(self), name1, name2,
-            newval, flags);
+                               newval, flags);
             ENTER_OVERLAP
             if (!ok)
                 Tkinter_Error(self);
@@ -2398,8 +2399,8 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[
     ENTER_PYTHON
 
     /* TBD: no error checking here since we know, via the
-    * Tkapp_CreateCommand() that the client data is a two-tuple
-    */
+     * Tkapp_CreateCommand() that the client data is a two-tuple
+     */
     func = data->func;
 
     /* Create argument list (argv1, ..., argvN) */
@@ -2421,14 +2422,14 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[
         return PythonCmd_Error();
 
     obj_res = AsObj(res);
-    if (obj_res) {
-        Tcl_SetObjResult(interp, obj_res);
-        rv = TCL_OK;
-    }
     if (obj_res == NULL) {
         Py_DECREF(res);
         return PythonCmd_Error();
     }
+    else {
+        Tcl_SetObjResult(interp, obj_res);
+        rv = TCL_OK;
+    }
 
     Py_DECREF(res);