summaryrefslogtreecommitdiffstats
path: root/Demo/tkinter
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-03-31 01:51:45 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-03-31 01:51:45 (GMT)
commit2a691a814914a9d2b2188cac25426543a14a8500 (patch)
treef185d13c060efb0cb0877df705aba3ed62e96434 /Demo/tkinter
parent7315bad3c4be4c0053e8f98d8410009238b98af8 (diff)
downloadcpython-2a691a814914a9d2b2188cac25426543a14a8500.zip
cpython-2a691a814914a9d2b2188cac25426543a14a8500.tar.gz
cpython-2a691a814914a9d2b2188cac25426543a14a8500.tar.bz2
Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r62021 | benjamin.peterson | 2008-03-28 18:11:01 -0500 (Fri, 28 Mar 2008) | 2 lines NIL => NULL ........ r62029 | amaury.forgeotdarc | 2008-03-28 20:42:31 -0500 (Fri, 28 Mar 2008) | 3 lines Correctly call the base class tearDown(); otherwise running test_logging twice produce the errors we see on all buildbots ........ r62035 | raymond.hettinger | 2008-03-29 05:42:07 -0500 (Sat, 29 Mar 2008) | 1 line Be explicit about what efficient means. ........ r62036 | georg.brandl | 2008-03-29 06:46:18 -0500 (Sat, 29 Mar 2008) | 2 lines Fix capitalization. ........ r62037 | amaury.forgeotdarc | 2008-03-29 07:42:54 -0500 (Sat, 29 Mar 2008) | 5 lines lib2to3 should install a logging handler only when run as a main program, not when used as a library. This may please the buildbots, which fail when test_lib2to3 is run before test_logging. ........ r62043 | benjamin.peterson | 2008-03-29 10:24:25 -0500 (Sat, 29 Mar 2008) | 3 lines #2503 make singletons compared with "is" not == or != Thanks to Wummel for the patch ........ r62044 | gerhard.haering | 2008-03-29 14:11:52 -0500 (Sat, 29 Mar 2008) | 2 lines Documented the lastrowid attribute. ........ r62052 | benjamin.peterson | 2008-03-30 14:35:10 -0500 (Sun, 30 Mar 2008) | 2 lines Updated README regarding doc formats ........ r62053 | georg.brandl | 2008-03-30 14:41:39 -0500 (Sun, 30 Mar 2008) | 2 lines The other download formats will be available for 2.6 too. ........
Diffstat (limited to 'Demo/tkinter')
-rw-r--r--Demo/tkinter/guido/paint.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Demo/tkinter/guido/paint.py b/Demo/tkinter/guido/paint.py
index d46e20b..7b2e814 100644
--- a/Demo/tkinter/guido/paint.py
+++ b/Demo/tkinter/guido/paint.py
@@ -50,7 +50,7 @@ def b1up(event):
def motion(event):
if b1 == "down":
global xold, yold
- if xold != None and yold != None:
+ if xold is not None and yold is not None:
event.widget.create_line(xold,yold,event.x,event.y,smooth=TRUE)
# here's where you draw it. smooth. neat.
xold = event.x