Commits

Amaury Forgeot d'Arc committed c2b25af

Refresh patch queue

Comments (0)

Files changed (3)

py3k-__next__.patch

-diff -r 3dd3a141bf60 wxPython/src/_defs.i
---- a/wxPython/src/_defs.i	Fri Aug 27 14:20:31 2010 +0200
-+++ b/wxPython/src/_defs.i	Fri Aug 27 15:29:29 2010 +0200
+diff -r 9c61a437905d wxPython/demo/Toolbook.py
+--- a/wxPython/demo/Toolbook.py	Sat May 21 16:04:00 2011 +0200
++++ b/wxPython/demo/Toolbook.py	Sun May 22 21:37:27 2011 +0200
+@@ -44,7 +44,7 @@
+         first = True
+         for colour in colourList:
+             win = self.makeColorPanel(colour)
+-            self.AddPage(win, colour, imageId=imageIdGenerator.next())
++            self.AddPage(win, colour, imageId=next(imageIdGenerator))
+             if first:
+                 st = wx.StaticText(win.win, -1,
+                           "You can put nearly any type of window here,\n"
+diff -r 9c61a437905d wxPython/demo/Treebook.py
+--- a/wxPython/demo/Treebook.py	Sat May 21 16:04:00 2011 +0200
++++ b/wxPython/demo/Treebook.py	Sun May 22 21:37:27 2011 +0200
+@@ -44,7 +44,7 @@
+         first = True
+         for colour in colourList:
+             win = self.makeColorPanel(colour)
+-            self.AddPage(win, colour, imageId=imageIdGenerator.next())
++            self.AddPage(win, colour, imageId=next(imageIdGenerator))
+             if first:
+                 st = wx.StaticText(win.win, -1,
+                           "You can put nearly any type of window here,\n"
+@@ -55,7 +55,7 @@
+ 
+             win = self.makeColorPanel(colour)
+             st = wx.StaticText(win.win, -1, "this is a sub-page", (10,10))
+-            self.AddSubPage(win, 'a sub-page', imageId=imageIdGenerator.next())
++            self.AddSubPage(win, 'a sub-page', imageId=next(imageIdGenerator))
+ 
+         self.Bind(wx.EVT_TREEBOOK_PAGE_CHANGED, self.OnPageChanged)
+         self.Bind(wx.EVT_TREEBOOK_PAGE_CHANGING, self.OnPageChanging)
+diff -r 9c61a437905d wxPython/src/_defs.i
+--- a/wxPython/src/_defs.i	Sat May 21 16:04:00 2011 +0200
++++ b/wxPython/src/_defs.i	Sun May 22 21:37:27 2011 +0200
 @@ -534,6 +534,7 @@
      ~ListClass_iterator();
      KeepGIL(next);

py3k-compatible-map.patch

+diff -r db1954603d98 wxPython/wx/lib/imageutils.py
+--- a/wxPython/wx/lib/imageutils.py	Sat May 21 15:58:55 2011 +0200
++++ b/wxPython/wx/lib/imageutils.py	Sun May 22 21:59:07 2011 +0200
+@@ -27,14 +27,14 @@
+     else:
+         alpha = None
+         
+-    data = map(ord, list(anImage.GetData()))
++    data = bytearray(anImage.GetData())
+ 
+     for i in range(0, len(data), 3):
+         pixel = (data[i], data[i+1], data[i+2])
+         pixel = makeGray(pixel, factor, maskColor)
+         for x in range(3):
+             data[i+x] = pixel[x]
+-    anImage.SetData(''.join(map(chr, data)))
++    anImage.SetData(data)
+     if alpha:
+         anImage.SetAlphaData(alpha)
+         
 diff -r db1954603d98 wxPython/wx/lib/itemspicker.py
 --- a/wxPython/wx/lib/itemspicker.py	Sat May 21 15:58:55 2011 +0200
-+++ b/wxPython/wx/lib/itemspicker.py	Sat May 21 16:03:35 2011 +0200
++++ b/wxPython/wx/lib/itemspicker.py	Sun May 22 21:59:07 2011 +0200
 @@ -133,7 +133,7 @@
              
      def _MoveItems(self,source,dest):

py3k-compatible-single-print.patch

-diff -r dd7115ed8251 wx/build/tools/build-wxwidgets.py
---- a/wx/build/tools/build-wxwidgets.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wx/build/tools/build-wxwidgets.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wx/build/tools/build-wxwidgets.py
+--- a/wx/build/tools/build-wxwidgets.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wx/build/tools/build-wxwidgets.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -56,7 +56,7 @@
  
  def exitIfError(code, msg):
              args.append("-f makefile.vc")
              if options.unicode:
                  args.append("UNICODE=1")
-@@ -410,11 +410,11 @@
+@@ -415,11 +415,11 @@
          
              
      if not wxBuilder:
      if options.clean:
 -        print "Performing cleanup."
 +        print("Performing cleanup.")
-         wxBuilder.clean()
+         wxBuilder.clean(dir=buildDir, options=args)
          
-         if options.wxpython:
-@@ -454,7 +454,7 @@
+         sys.exit(0)
+@@ -446,7 +446,7 @@
                  links.append(reallib)
                  reallib = "lib/" + os.readlink(reallib)
                  
              run("mv -f %s lib/%s.dylib" % (reallib, frameworkname))
              
              for link in links:
-@@ -462,7 +462,7 @@
+@@ -454,7 +454,7 @@
      
          frameworkRootDir = prefixDir
          if installDir:
              frameworkRootDir = installDir + prefixDir
          os.chdir(frameworkRootDir)
          build_string = ""
-@@ -558,10 +558,10 @@
+@@ -550,10 +550,10 @@
          file('lib/wx/config/%s' % configname, 'w').write(text)
          
          # The framework is finished!
          
          
      # adjust the install_name if needed
-@@ -595,7 +595,7 @@
+@@ -587,7 +587,7 @@
          args.append("--version %s" % getWxRelease())
          args.append("--out %s" % os.path.join(packagedir, packageName + ".pkg"))
          cmd = packageMakerPath + ' '.join(args)
          run(cmd)
          
          os.chdir(options.mac_distdir)
-diff -r dd7115ed8251 wx/build/tools/builder.py
---- a/wx/build/tools/builder.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wx/build/tools/builder.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wx/build/tools/builder.py
+--- a/wx/build/tools/builder.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wx/build/tools/builder.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -18,7 +18,7 @@
  
      commandStr = " ".join(command)
      result = os.system(commandStr)
  
      if dir:
-@@ -177,7 +177,7 @@
+@@ -181,7 +181,7 @@
  
          optionsStr = " ".join(options) if options else ""
          command = "%s %s" % (configure_cmd, optionsStr)
          result = os.system(command)
          #os.chdir(olddir)
          return result
-diff -r dd7115ed8251 wxPython/b
---- a/wxPython/b	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/b	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/b
+--- a/wxPython/b	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/b	Thu Jun 23 03:28:33 2011 +0200
 @@ -33,7 +33,7 @@
      fi
  fi
  
  
  if [ "$SWIG" = "" ]; then
-diff -r dd7115ed8251 wxPython/build-wxpython.py
---- a/wxPython/build-wxpython.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/build-wxpython.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/build-wxpython.py
+--- a/wxPython/build-wxpython.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/build-wxpython.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -39,7 +39,7 @@
      sys.path.insert(0, os.path.dirname(wxscript))
      wxbuild = __import__('build-wxwidgets')
 +print(" - Run python demo/demo.py")
 +print("")
  
-diff -r dd7115ed8251 wxPython/config.py
---- a/wxPython/config.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/config.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/config.py
+--- a/wxPython/config.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/config.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -32,7 +32,7 @@
          ez_setup.use_setuptools()
          from setuptools import setup, Extension
      
  
  #----------------------------------------------------------------------
-diff -r dd7115ed8251 wxPython/demo/ComboBox.py
---- a/wxPython/demo/ComboBox.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/ComboBox.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/ComboBox.py
+--- a/wxPython/demo/ComboBox.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/ComboBox.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -5,11 +5,11 @@
  
  class TestComboBox(wx.Panel):
          evt.Skip()
  
      def __init__(self, parent, log):
-diff -r dd7115ed8251 wxPython/demo/FloatBar.py
---- a/wxPython/demo/FloatBar.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/FloatBar.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/FloatBar.py
+--- a/wxPython/demo/FloatBar.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/FloatBar.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -74,7 +74,7 @@
          self.log.WriteText("tool %s clicked\n" % event.GetId())
  
  
              if event.GetExtraLong():
                  self.tb.SetTitle("")
-diff -r dd7115ed8251 wxPython/demo/FloatCanvas.py
---- a/wxPython/demo/FloatCanvas.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/FloatCanvas.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/FloatCanvas.py
+--- a/wxPython/demo/FloatCanvas.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/FloatCanvas.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -1384,11 +1384,11 @@
              for i in range(1000):
                  Point = (random.uniform(BigRange[0],BigRange[1]),random.uniform(BigRange[0],BigRange[1]))
              if AllLines:
                  Lines = []
                  for segment in Shorelines:
-diff -r dd7115ed8251 wxPython/demo/GridBagSizer.py
---- a/wxPython/demo/GridBagSizer.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/GridBagSizer.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/GridBagSizer.py
+--- a/wxPython/demo/GridBagSizer.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/GridBagSizer.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -118,9 +118,9 @@
          pt = evt.GetPosition()
          item = self.gbs.FindItemAtPoint(pt)
  
          
  #---------------------------------------------------------------------------
-diff -r dd7115ed8251 wxPython/demo/GridCustTable.py
---- a/wxPython/demo/GridCustTable.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/GridCustTable.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/GridCustTable.py
+--- a/wxPython/demo/GridCustTable.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/GridCustTable.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -154,10 +154,10 @@
          p.SetSizer(bs)
  
  
  
  #---------------------------------------------------------------------------
-diff -r dd7115ed8251 wxPython/demo/GridHugeTable.py
---- a/wxPython/demo/GridHugeTable.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/GridHugeTable.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/GridHugeTable.py
+--- a/wxPython/demo/GridHugeTable.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/GridHugeTable.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -61,8 +61,8 @@
          self.Bind(gridlib.EVT_GRID_CELL_RIGHT_CLICK, self.OnRightDown)  
  
  
  
  #---------------------------------------------------------------------------
-diff -r dd7115ed8251 wxPython/demo/ListCtrl.py
---- a/wxPython/demo/ListCtrl.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/ListCtrl.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/ListCtrl.py
+--- a/wxPython/demo/ListCtrl.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/ListCtrl.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -335,8 +335,8 @@
  
      def OnPopupOne(self, event):
  
      def OnPopupSix(self, event):
          self.list.EditLabel(self.currentItem)
-diff -r dd7115ed8251 wxPython/demo/Main.py
---- a/wxPython/demo/Main.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/Main.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/Main.py
+--- a/wxPython/demo/Main.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/Main.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -2466,10 +2466,10 @@
          app = wx.GetApp()
          if event.Checked():
  
  
      def OnAllowDownload(self, event):
-diff -r dd7115ed8251 wxPython/demo/MiniFrame.py
---- a/wxPython/demo/MiniFrame.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/MiniFrame.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/MiniFrame.py
+--- a/wxPython/demo/MiniFrame.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/MiniFrame.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -20,7 +20,7 @@
          self.Close(True)
  
          self.Destroy()
  
  #---------------------------------------------------------------------------
-diff -r dd7115ed8251 wxPython/demo/OGL.py
---- a/wxPython/demo/OGL.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/OGL.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/OGL.py
+--- a/wxPython/demo/OGL.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/OGL.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -181,7 +181,7 @@
  
  
          ogl.DividedShape.OnSizingEndDragLeft(self, pt, x, y, keys, attch)
          self.SetRegionSizes()
          self.ReformatRegions()
-diff -r dd7115ed8251 wxPython/demo/PlateButton.py
---- a/wxPython/demo/PlateButton.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/PlateButton.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/PlateButton.py
+--- a/wxPython/demo/PlateButton.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/PlateButton.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -253,7 +253,7 @@
          pass
  
  
  #----------------------------------------------------------------------
  
-diff -r dd7115ed8251 wxPython/demo/SizedControls.py
---- a/wxPython/demo/SizedControls.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/SizedControls.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/SizedControls.py
+--- a/wxPython/demo/SizedControls.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/SizedControls.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -270,7 +270,7 @@
          
  
          dlg = FormDialog(self, -1)
          dlg.CenterOnScreen()
  
-diff -r dd7115ed8251 wxPython/demo/StyledTextCtrl_1.py
---- a/wxPython/demo/StyledTextCtrl_1.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/StyledTextCtrl_1.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/StyledTextCtrl_1.py
+--- a/wxPython/demo/StyledTextCtrl_1.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/StyledTextCtrl_1.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -268,27 +268,26 @@
  
      # some test stuff...
  
  
      wx.CallAfter(ed.GotoPos, 0)
-diff -r dd7115ed8251 wxPython/demo/SystemSettings.py
---- a/wxPython/demo/SystemSettings.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/SystemSettings.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/SystemSettings.py
+--- a/wxPython/demo/SystemSettings.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/SystemSettings.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -301,7 +301,7 @@
          pass
  
  
  #----------------------------------------------------------------------
  
-diff -r dd7115ed8251 wxPython/demo/TextCtrl.py
---- a/wxPython/demo/TextCtrl.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/TextCtrl.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/TextCtrl.py
+--- a/wxPython/demo/TextCtrl.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/TextCtrl.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -6,13 +6,13 @@
  
  class TestPanel(wx.Panel):
          evt.Skip()
  
  
-diff -r dd7115ed8251 wxPython/demo/TimeCtrl.py
---- a/wxPython/demo/TimeCtrl.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/TimeCtrl.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/TimeCtrl.py
+--- a/wxPython/demo/TimeCtrl.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/TimeCtrl.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -205,7 +205,7 @@
              min, max = None, None
  
          if min and (min != cur_min): self.target_ctrl.SetMin( min )
          if max and (max != cur_max): self.target_ctrl.SetMax( max )
  
-diff -r dd7115ed8251 wxPython/demo/UIActionSimulator.py
---- a/wxPython/demo/UIActionSimulator.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/UIActionSimulator.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/UIActionSimulator.py
+--- a/wxPython/demo/UIActionSimulator.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/UIActionSimulator.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -88,7 +88,7 @@
      def _setNextKeyEvent(self):
          evtType, key, modifiers, milli = self._playbackEvents.pop(0)
          wx.CallLater(milli, self._playbackKey, evtType, key, modifiers)
              
      
-diff -r dd7115ed8251 wxPython/demo/XMLtreeview.py
---- a/wxPython/demo/XMLtreeview.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/XMLtreeview.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/XMLtreeview.py
+--- a/wxPython/demo/XMLtreeview.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/XMLtreeview.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -44,11 +44,11 @@
          self.draggingItem = None
  
              return
  
          # For this simple example just take the text of the source item
-diff -r dd7115ed8251 wxPython/demo/agw/ListCtrl.py
---- a/wxPython/demo/agw/ListCtrl.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/agw/ListCtrl.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/agw/ListCtrl.py
+--- a/wxPython/demo/agw/ListCtrl.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/agw/ListCtrl.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -335,8 +335,8 @@
  
      def OnPopupOne(self, event):
  
      def OnPopupSix(self, event):
          self.list.EditLabel(self.currentItem)
-diff -r dd7115ed8251 wxPython/demo/agw/run.py
---- a/wxPython/demo/agw/run.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/agw/run.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/agw/run.py
+--- a/wxPython/demo/agw/run.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/agw/run.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -23,8 +23,8 @@
  import sys, os
  
          raise SystemExit
  
      name, ext  = os.path.splitext(argv[1])
-diff -r dd7115ed8251 wxPython/demo/dllwidget/test_prog.py
---- a/wxPython/demo/dllwidget/test_prog.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/dllwidget/test_prog.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/dllwidget/test_prog.py
+--- a/wxPython/demo/dllwidget/test_prog.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/dllwidget/test_prog.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -38,7 +38,7 @@
  
          if dw.Ok():
  
              # This shows that we can give it a child from this side of things.
              # You can also call any wxWindow methods on it too.
-diff -r dd7115ed8251 wxPython/demo/infoframe.py
---- a/wxPython/demo/infoframe.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/infoframe.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/infoframe.py
+--- a/wxPython/demo/infoframe.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/infoframe.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -51,7 +51,7 @@
          # Now point to the output object for stdout
          sys.stdout = self.output = output
              return True
  
      # *extremely important*
-diff -r dd7115ed8251 wxPython/demo/run.py
---- a/wxPython/demo/run.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/demo/run.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/demo/run.py
+--- a/wxPython/demo/run.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/demo/run.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -23,10 +23,10 @@
  import sys, os
  
          raise SystemExit
  
      name, ext  = os.path.splitext(argv[1])
-diff -r dd7115ed8251 wxPython/distrib/makemo.py
---- a/wxPython/distrib/makemo.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/distrib/makemo.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/distrib/makemo.py
+--- a/wxPython/distrib/makemo.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/distrib/makemo.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -9,8 +9,8 @@
     if mo != 'wxstd.mo':
         if newer(po, mo):
         else:
 -           print "%s is up to date" % mo
 +           print("%s is up to date" % mo)
-diff -r dd7115ed8251 wxPython/src/_xrc_ex.py
---- a/wxPython/src/_xrc_ex.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/src/_xrc_ex.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/src/_xrc_ex.py
+--- a/wxPython/src/_xrc_ex.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/src/_xrc_ex.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -14,7 +14,7 @@
          mod = __import__(name)
      except ImportError:
          raise
      components = name.split('.')
      for comp in components[1:]:
-diff -r dd7115ed8251 wxPython/wx/lib/evtmgr.py
---- a/wxPython/wx/lib/evtmgr.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/evtmgr.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/evtmgr.py
+--- a/wxPython/wx/lib/evtmgr.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/evtmgr.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -446,9 +446,9 @@
      def Destroy(self):
          try:
              eventManager.DeregisterWindow(frame)
  
      # Send togglebutton events to both the on/off code as well
-diff -r dd7115ed8251 wxPython/wx/lib/filebrowsebutton.py
---- a/wxPython/wx/lib/filebrowsebutton.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/filebrowsebutton.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/filebrowsebutton.py
+--- a/wxPython/wx/lib/filebrowsebutton.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/filebrowsebutton.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -371,7 +371,7 @@
          def __init__( self, tag ):
              self.tag = tag
      test( )
  
  
-diff -r dd7115ed8251 wxPython/wx/lib/floatbar.py
---- a/wxPython/wx/lib/floatbar.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/floatbar.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/floatbar.py
+--- a/wxPython/wx/lib/floatbar.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/floatbar.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -125,7 +125,7 @@
  
  
                      self.nullbar.Reparent(self.floatframe)
                      self.parentframe.SetToolBar(None)
                      size = self.parentframe.GetSize()
-diff -r dd7115ed8251 wxPython/wx/lib/intctrl.py
---- a/wxPython/wx/lib/intctrl.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/intctrl.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/intctrl.py
+--- a/wxPython/wx/lib/intctrl.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/intctrl.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -879,7 +879,7 @@
              self.Bind(EVT_INT, self.OnInt, self.int_ctrl)
  
              del dlg
              self.frame.Destroy()
  
-diff -r dd7115ed8251 wxPython/wx/lib/itemspicker.py
---- a/wxPython/wx/lib/itemspicker.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/itemspicker.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/itemspicker.py
+--- a/wxPython/wx/lib/itemspicker.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/itemspicker.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -234,7 +234,7 @@
      d.SetSizer(d.sizer)
      test.SetTopWindow(frame)
      d.Bind(EVT_IP_SELECTION_CHANGED, callback)
      d.ShowModal()
      d.Destroy()
-diff -r dd7115ed8251 wxPython/wx/lib/langlistctrl.py
---- a/wxPython/wx/lib/langlistctrl.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/langlistctrl.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/langlistctrl.py
+--- a/wxPython/wx/lib/langlistctrl.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/langlistctrl.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -400,7 +400,7 @@
  if __name__ == '__main__':
      a = wx.PySimpleApp()
      
      f=wx.Frame(None, -1)
      f.p=wx.Panel(f, -1)
-diff -r dd7115ed8251 wxPython/wx/lib/layoutf.py
---- a/wxPython/wx/lib/layoutf.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/layoutf.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/layoutf.py
+--- a/wxPython/wx/lib/layoutf.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/layoutf.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -174,11 +174,11 @@
                  attr = getattr(self, self.attr_d[g[0]])
                  func = getattr(attr, self.op_d[g[1]])
  
  if __name__=='__main__':
  
-diff -r dd7115ed8251 wxPython/wx/lib/masked/ipaddrctrl.py
---- a/wxPython/wx/lib/masked/ipaddrctrl.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/masked/ipaddrctrl.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/masked/ipaddrctrl.py
+--- a/wxPython/wx/lib/masked/ipaddrctrl.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/masked/ipaddrctrl.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -155,7 +155,7 @@
      def _OnCtrl_S(self, event):
  ##        dbg("IpAddrCtrl::_OnCtrl_S")
          return False
  
      def SetValue(self, value):
-diff -r dd7115ed8251 wxPython/wx/lib/masked/maskededit.py
---- a/wxPython/wx/lib/masked/maskededit.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/masked/maskededit.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/masked/maskededit.py
+--- a/wxPython/wx/lib/masked/maskededit.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/masked/maskededit.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -3317,9 +3317,9 @@
          """ Default Ctrl-S handler; prints value information if demo enabled. """
  ##        dbg("MaskedEditMixin::_OnCtrl_S")
  
  ## ---------- ---------- ---------- ---------- ---------- ---------- ----------
  
-diff -r dd7115ed8251 wxPython/wx/lib/masked/numctrl.py
---- a/wxPython/wx/lib/masked/numctrl.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/masked/numctrl.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/masked/numctrl.py
+--- a/wxPython/wx/lib/masked/numctrl.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/masked/numctrl.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -1856,7 +1856,7 @@
              self.Bind(EVT_NUM, self.OnChange, self.int_ctrl)
  
              del dlg
              self.frame.Destroy()
  
-diff -r dd7115ed8251 wxPython/wx/lib/printout.py
---- a/wxPython/wx/lib/printout.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/printout.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/printout.py
+--- a/wxPython/wx/lib/printout.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/printout.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -319,16 +319,18 @@
                  self.column.append(pos_x)   # position of each column
  
              return
  
          for col in range(column_total):
-diff -r dd7115ed8251 wxPython/wx/lib/pubsub/__init__.py
---- a/wxPython/wx/lib/pubsub/__init__.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/pubsub/__init__.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/pubsub/__init__.py
+--- a/wxPython/wx/lib/pubsub/__init__.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/pubsub/__init__.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -47,7 +47,7 @@
      import sys
      ll = [mod for mod in sys.modules.keys() if mod.find('pubsub') >= 0]
  
  
  def _tryAutoSetupV1():
-diff -r dd7115ed8251 wxPython/wx/lib/sized_controls.py
---- a/wxPython/wx/lib/sized_controls.py	Sat May 21 14:57:08 2011 +0200
-+++ b/wxPython/wx/lib/sized_controls.py	Sat May 21 15:58:51 2011 +0200
+diff -r e74dd7b9d32e wxPython/wx/lib/sized_controls.py
+--- a/wxPython/wx/lib/sized_controls.py	Thu Jun 23 03:27:11 2011 +0200
++++ b/wxPython/wx/lib/sized_controls.py	Thu Jun 23 03:28:33 2011 +0200
 @@ -96,7 +96,7 @@
              return wx.Size(10, 10)