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.
........
diff --git a/Demo/classes/Dbm.py b/Demo/classes/Dbm.py
index ecc117d..617fe99 100755
--- a/Demo/classes/Dbm.py
+++ b/Demo/classes/Dbm.py
@@ -50,7 +50,7 @@
value = d[key]
print('currently:', value)
value = eval(input('value: '))
- if value == None:
+ if value is None:
del d[key]
else:
d[key] = value
diff --git a/Demo/curses/ncurses.py b/Demo/curses/ncurses.py
index fc22ff7..0bdc1a9 100644
--- a/Demo/curses/ncurses.py
+++ b/Demo/curses/ncurses.py
@@ -9,7 +9,7 @@
from curses import panel
def wGetchar(win = None):
- if win == None: win = stdscr
+ if win is None: win = stdscr
return win.getch()
def Getchar():
diff --git a/Demo/rpc/mountclient.py b/Demo/rpc/mountclient.py
index 3bb88b1..81797df 100644
--- a/Demo/rpc/mountclient.py
+++ b/Demo/rpc/mountclient.py
@@ -100,7 +100,7 @@
# This function is called to cough up a suitable
# authentication object for a call to procedure 'proc'.
def mkcred(self):
- if self.cred == None:
+ if self.cred is None:
self.cred = rpc.AUTH_UNIX, rpc.make_auth_unix_default()
return self.cred
diff --git a/Demo/rpc/nfsclient.py b/Demo/rpc/nfsclient.py
index aad8cf3..c36e3d2 100644
--- a/Demo/rpc/nfsclient.py
+++ b/Demo/rpc/nfsclient.py
@@ -129,7 +129,7 @@
self.unpacker = NFSUnpacker('')
def mkcred(self):
- if self.cred == None:
+ if self.cred is None:
self.cred = rpc.AUTH_UNIX, rpc.make_auth_unix_default()
return self.cred
@@ -170,7 +170,7 @@
for fileid, name, cookie in entries:
list.append((fileid, name))
last_cookie = cookie
- if eof or last_cookie == None:
+ if eof or last_cookie is None:
break
ra = (ra[0], last_cookie, ra[2])
return list
@@ -184,7 +184,7 @@
else: filesys = None
from mountclient import UDPMountClient, TCPMountClient
mcl = TCPMountClient(host)
- if filesys == None:
+ if filesys is None:
list = mcl.Export()
for item in list:
print(item)
diff --git a/Demo/rpc/rpc.py b/Demo/rpc/rpc.py
index 99115d3..789880b 100644
--- a/Demo/rpc/rpc.py
+++ b/Demo/rpc/rpc.py
@@ -260,13 +260,13 @@
def mkcred(self):
# Override this to use more powerful credentials
- if self.cred == None:
+ if self.cred is None:
self.cred = (AUTH_NULL, make_auth_null())
return self.cred
def mkverf(self):
# Override this to use a more powerful verifier
- if self.verf == None:
+ if self.verf is None:
self.verf = (AUTH_NULL, make_auth_null())
return self.verf
@@ -317,7 +317,7 @@
def bindresvport(sock, host):
global last_resv_port_tried
FIRST, LAST = 600, 1024 # Range of ports to try
- if last_resv_port_tried == None:
+ if last_resv_port_tried is None:
import os
last_resv_port_tried = FIRST + os.getpid() % (LAST-FIRST)
for i in range(last_resv_port_tried, LAST) + \
@@ -811,7 +811,7 @@
def session(self):
call, host_port = self.sock.recvfrom(8192)
reply = self.handle(call)
- if reply != None:
+ if reply is not None:
self.sock.sendto(reply, host_port)
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 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