mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Benjamin Peterson 2008-03-31 01:51:45 +00:00
parent 7315bad3c4
commit 2a691a8149
59 changed files with 175 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/plat-mac/FrameWork.py
View file

@ -92,7 +92,7 @@ _watch = None
def setwatchcursor():
global _watch
if _watch == None:
if _watch is None:
_watch = GetCursor(4).data
SetCursor(_watch)
@ -129,7 +129,7 @@ class Application:
self._quititem = MenuItem(m, "Quit", "Q", self._quit)
def gethelpmenu(self):
if self._helpmenu == None:
if self._helpmenu is None:
self._helpmenu = HelpMenu(self.menubar)
return self._helpmenu
@ -266,7 +266,7 @@ class Application:
else:
name = "do_%d" % partcode
if wid == None:
if wid is None:
# No window, or a non-python window
try:
handler = getattr(self, name)
@ -475,7 +475,7 @@ class MenuBar:
self.menus = None
def addmenu(self, title, after = 0, id=None):
if id == None:
if id is None:
id = self.getnextid()
if DEBUG: print('Newmenu', title, id) # XXXX
m = NewMenu(id, title)
@ -907,8 +907,8 @@ class ScrolledWindow(ControlsWindow):
self.barx_enabled = self.bary_enabled = 1
x0, y0, x1, y1 = self.wid.GetWindowPort().GetPortBounds()
vx, vy = self.getscrollbarvalues()
if vx == None: self.barx_enabled, vx = 0, 0
if vy == None: self.bary_enabled, vy = 0, 0
if vx is None: self.barx_enabled, vx = 0, 0
if vy is None: self.bary_enabled, vy = 0, 0
if wantx:
rect = x0-1, y1-(SCROLLBARWIDTH-1), x1-(SCROLLBARWIDTH-2), y1+1
self.barx = NewControl(self.wid, rect, "", 1, vx, 0, 32767, 16, 0)
@ -1007,7 +1007,7 @@ class ScrolledWindow(ControlsWindow):
SetPort(self.wid)
vx, vy = self.getscrollbarvalues()
if self.barx:
if vx == None:
if vx is None:
self.barx.HiliteControl(255)
self.barx_enabled = 0
else:
@ -1017,7 +1017,7 @@ class ScrolledWindow(ControlsWindow):
self.barx.HiliteControl(0)
self.barx.SetControlValue(vx)
if self.bary:
if vy == None:
if vy is None:
self.bary.HiliteControl(255)
self.bary_enabled = 0
else: