summaryrefslogtreecommitdiff
path: root/Demo/rpc/nfsclient.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-03-31 01:51:45 +0000
committerBenjamin Peterson <benjamin@python.org>2008-03-31 01:51:45 +0000
commit21dd8d00732fb1613a1243450ffb1c154f3e63c5 (patch)
treeab37eee336e56f1780ca28bc09d62f3dfdd66dbc /Demo/rpc/nfsclient.py
parent346ab325148dd7e74ebc2bf14025f2d00af5b506 (diff)
downloadcpython-21dd8d00732fb1613a1243450ffb1c154f3e63c5.tar.gz
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/rpc/nfsclient.py')
-rw-r--r--Demo/rpc/nfsclient.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Demo/rpc/nfsclient.py b/Demo/rpc/nfsclient.py
index aad8cf3000..c36e3d28dd 100644
--- a/Demo/rpc/nfsclient.py
+++ b/Demo/rpc/nfsclient.py
@@ -129,7 +129,7 @@ class NFSClient(UDPClient):
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 @@ class NFSClient(UDPClient):
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 @@ def test():
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)