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/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 0b62ea6..6cf9c21 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -289,7 +289,7 @@
fd = os.popen(commandline, 'r')
data = fd.read()
xit = fd.close()
- if xit != None:
+ if xit is not None:
sys.stdout.write(data)
raise RuntimeError("command failed: %s"%(commandline,))
@@ -300,7 +300,7 @@
fd = os.popen(commandline, 'r')
data = fd.read()
xit = fd.close()
- if xit != None:
+ if xit is not None:
sys.stdout.write(data)
raise RuntimeError("command failed: %s"%(commandline,))
diff --git a/Mac/Demo/applescript/Disk_Copy/Utility_Events.py b/Mac/Demo/applescript/Disk_Copy/Utility_Events.py
index 03df938..9213345 100644
--- a/Mac/Demo/applescript/Disk_Copy/Utility_Events.py
+++ b/Mac/Demo/applescript/Disk_Copy/Utility_Events.py
@@ -26,7 +26,7 @@
_subcode = 'SEL1'
aetools.keysubst(_arguments, self._argmap_select_disk_image)
- if _no_object != None: raise TypeError('No direct arg expected')
+ if _no_object is not None: raise TypeError('No direct arg expected')y
aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT)
@@ -52,8 +52,7 @@
_subcode = 'SEL2'
aetools.keysubst(_arguments, self._argmap_select_DiskScript)
- if _no_object != None: raise TypeError('No direct arg expected')
-
+ if _no_object is not None: raise TypeError('No direct arg expected')
aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT)
_reply, _arguments, _attributes = self.send(_code, _subcode,
@@ -78,7 +77,7 @@
_subcode = 'SEL3'
aetools.keysubst(_arguments, self._argmap_select_disk_image_or_DiskScript)
- if _no_object != None: raise TypeError('No direct arg expected')
+ if _no_object is not None: raise TypeError('No direct arg expected')
aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT)
@@ -104,7 +103,7 @@
_subcode = 'SEL4'
aetools.keysubst(_arguments, self._argmap_select_floppy_disk_image)
- if _no_object != None: raise TypeError('No direct arg expected')
+ if _no_object is not None: raise TypeError('No direct arg expected')
aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT)
@@ -130,7 +129,7 @@
_subcode = 'SEL5'
aetools.keysubst(_arguments, self._argmap_select_disk)
- if _no_object != None: raise TypeError('No direct arg expected')
+ if _no_object is not None: raise TypeError('No direct arg expected')
aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT)
@@ -156,7 +155,7 @@
_subcode = 'SEL6'
aetools.keysubst(_arguments, self._argmap_select_folder)
- if _no_object != None: raise TypeError('No direct arg expected')
+ if _no_object is not None: raise TypeError('No direct arg expected')
aetools.enumsubst(_arguments, 'SELp', _Enum_TEXT)
diff --git a/Mac/Tools/Doc/HelpIndexingTool/Standard_Suite.py b/Mac/Tools/Doc/HelpIndexingTool/Standard_Suite.py
index 140e8b9..7f0b63a 100644
--- a/Mac/Tools/Doc/HelpIndexingTool/Standard_Suite.py
+++ b/Mac/Tools/Doc/HelpIndexingTool/Standard_Suite.py
@@ -103,7 +103,7 @@
_subcode = 'crel'
aetools.keysubst(_arguments, self._argmap_make)
- if _no_object != None: raise TypeError('No direct arg expected')
+ if _no_object is not None: raise TypeError('No direct arg expected')
_reply, _arguments, _attributes = self.send(_code, _subcode,
diff --git a/Mac/Tools/Doc/setup.py b/Mac/Tools/Doc/setup.py
index e1d8fb1..b020b40 100644
--- a/Mac/Tools/Doc/setup.py
+++ b/Mac/Tools/Doc/setup.py
@@ -174,10 +174,10 @@
('root', 'root'))
# import pdb ; pdb.set_trace()
build_cmd = self.get_finalized_command('build')
- if self.build_dest == None:
+ if self.build_dest is None:
build_cmd = self.get_finalized_command('build')
self.build_dest = build_cmd.build_dest
- if self.install_doc == None:
+ if self.install_doc is None:
self.install_doc = os.path.join(self.prefix, DESTDIR)
print('INSTALL', self.build_dest, '->', self.install_doc)
diff --git a/Mac/scripts/buildpkg.py b/Mac/scripts/buildpkg.py
index ad0afe4..c592588 100644
--- a/Mac/scripts/buildpkg.py
+++ b/Mac/scripts/buildpkg.py
@@ -183,7 +183,7 @@
# set folder attributes
self.sourceFolder = root
- if resources == None:
+ if resources is None:
self.resourceFolder = root
else:
self.resourceFolder = resources