Commits

Amaury Forgeot d'Arc committed 776960b

Update patches

  • Participants
  • Parent commits 56e7835

Comments (0)

Files changed (8)

File modern-has_key.patch

 dict.has_key() -> in
 
-diff -r 4d23a2d0e47a wxPython/build-wxpython.py
---- a/wxPython/build-wxpython.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/build-wxpython.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/build-wxpython.py
+--- a/wxPython/build-wxpython.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/build-wxpython.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -142,9 +142,9 @@
  build_options = ['--wxpython']
  wxpy_build_options = []
      WXWIN = os.environ["WXWIN"]
  else:
      if os.path.exists('../wxWidgets'):
-diff -r 4d23a2d0e47a wxPython/config.py
---- a/wxPython/config.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/config.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/config.py
+--- a/wxPython/config.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/config.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -896,7 +896,7 @@
      # Set compile flags and such for MSVC.  These values are derived
      # from the wxWidgets makefiles for MSVC, other compilers settings
          WXDIR = os.environ['WXWIN']
      else:
          if os.path.exists('../wxWidgets'):
-diff -r 4d23a2d0e47a wxPython/demo/DrawXXXList.py
---- a/wxPython/demo/DrawXXXList.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/demo/DrawXXXList.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/demo/DrawXXXList.py
+--- a/wxPython/demo/DrawXXXList.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/demo/DrawXXXList.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -105,10 +105,11 @@
          c = random.choice(colours)
          t = random.randint(1, 4)
              cache[c] = wx.Brush(c)
  
          brushes.append( cache[c] )
-diff -r 4d23a2d0e47a wxPython/demo/PseudoDC.py
---- a/wxPython/demo/PseudoDC.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/demo/PseudoDC.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/demo/PseudoDC.py
+--- a/wxPython/demo/PseudoDC.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/demo/PseudoDC.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -122,14 +122,15 @@
      def RandomPen(self):
          c = random.choice(colours)
              self.brush_cache[c] = wx.Brush(c)
  
          return self.brush_cache[c]
-diff -r 4d23a2d0e47a wxPython/distrib/build_renamers.py
---- a/wxPython/distrib/build_renamers.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/distrib/build_renamers.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/distrib/build_renamers.py
+--- a/wxPython/distrib/build_renamers.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/distrib/build_renamers.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -50,10 +50,7 @@
  # with the wx package.  We need to import modules from the wx package
  # here, then we'll put the wxPython.wx entry back in sys.modules.
  
  import wx.%s
  
-diff -r 4d23a2d0e47a wxPython/distrib/mac/buildpkg.py
---- a/wxPython/distrib/mac/buildpkg.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/distrib/mac/buildpkg.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/distrib/mac/buildpkg.py
+--- a/wxPython/distrib/mac/buildpkg.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/distrib/mac/buildpkg.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -231,7 +231,7 @@
  
          info = ""
                  info = info + "%s %%(%s)s\n" % (f, f)
          info = info % self.packageInfo
          base = self.packageInfo["Title"] + ".info"
-diff -r 4d23a2d0e47a wxPython/distrib/mac/bundlebuilder.py
---- a/wxPython/distrib/mac/bundlebuilder.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/distrib/mac/bundlebuilder.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/distrib/mac/bundlebuilder.py
+--- a/wxPython/distrib/mac/bundlebuilder.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/distrib/mac/bundlebuilder.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -465,7 +465,7 @@
                  if self.standalone or self.semi_standalone:
                      self.includeModules.append("argvemulator")
                      self.plist["CFBundleDocumentTypes"] = [
                          { "CFBundleTypeOSTypes" : [
                              "****",
-diff -r 4d23a2d0e47a wxPython/distrib/make_installer.py
---- a/wxPython/distrib/make_installer.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/distrib/make_installer.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/distrib/make_installer.py
+--- a/wxPython/distrib/make_installer.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/distrib/make_installer.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -24,11 +24,11 @@
  
  KEEP_TEMPS = False
  
  
  #----------------------------------------------------------------------
-diff -r 4d23a2d0e47a wxPython/distrib/propgrid/create_vcw.py
---- a/wxPython/distrib/propgrid/create_vcw.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/distrib/propgrid/create_vcw.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/distrib/propgrid/create_vcw.py
+--- a/wxPython/distrib/propgrid/create_vcw.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/distrib/propgrid/create_vcw.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -444,13 +444,13 @@
              if not base_t.startswith('const'):
                  t2 = "const %s"%base_t
                      tpl2 = ([(t2,'')],tm_tempdata,tm_content)
                      self.typemaps[tm_type][t2] = [tpl2]
  
-diff -r 4d23a2d0e47a wxPython/samples/StyleEditor/STCStyleEditor.py
---- a/wxPython/samples/StyleEditor/STCStyleEditor.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/StyleEditor/STCStyleEditor.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/StyleEditor/STCStyleEditor.py
+--- a/wxPython/samples/StyleEditor/STCStyleEditor.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/StyleEditor/STCStyleEditor.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -879,8 +879,11 @@
          self.populateCombosWithCommonDefs()
  
      names, vals = parseProp(prop)
      if 'back' in names:
          bkCol = strToCol(vals['back']%commonDefs)
-diff -r 4d23a2d0e47a wxPython/samples/ide/activegrid/tool/DebuggerService.py
---- a/wxPython/samples/ide/activegrid/tool/DebuggerService.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/ide/activegrid/tool/DebuggerService.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/ide/activegrid/tool/DebuggerService.py
+--- a/wxPython/samples/ide/activegrid/tool/DebuggerService.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/ide/activegrid/tool/DebuggerService.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -801,7 +801,7 @@
          phpIniPath = None
  
          self._lastPythonPath = config.Read(self.GetKey("LastPythonPath"), startval)
          self._pythonPathEntry = wx.TextCtrl(self, -1, self._lastPythonPath)
          self._pythonPathEntry.SetToolTipString(self._lastPythonPath)
-diff -r 4d23a2d0e47a wxPython/samples/ide/activegrid/tool/PHPDebugger.py
---- a/wxPython/samples/ide/activegrid/tool/PHPDebugger.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/ide/activegrid/tool/PHPDebugger.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/ide/activegrid/tool/PHPDebugger.py
+--- a/wxPython/samples/ide/activegrid/tool/PHPDebugger.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/ide/activegrid/tool/PHPDebugger.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -508,7 +508,7 @@
          # Check to see if we have any new breakpoints added.
          #
              #
              # Not in our bp list?  Anyway, create one for it.
              #
-diff -r 4d23a2d0e47a wxPython/samples/ide/activegrid/tool/ProjectEditor.py
---- a/wxPython/samples/ide/activegrid/tool/ProjectEditor.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/ide/activegrid/tool/ProjectEditor.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/ide/activegrid/tool/ProjectEditor.py
+--- a/wxPython/samples/ide/activegrid/tool/ProjectEditor.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/ide/activegrid/tool/ProjectEditor.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -777,7 +777,7 @@
          for projectFile in projectFiles:
              if (projectFile.type == basedocmgr.FILE_TYPE_SCHEMA):
              del self._mapToProject[key]
          
  
-diff -r 4d23a2d0e47a wxPython/samples/ide/activegrid/tool/SVNService.py
---- a/wxPython/samples/ide/activegrid/tool/SVNService.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/ide/activegrid/tool/SVNService.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/ide/activegrid/tool/SVNService.py
+--- a/wxPython/samples/ide/activegrid/tool/SVNService.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/ide/activegrid/tool/SVNService.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -168,7 +168,7 @@
  
          sizer = wx.FlexGridSizer(cols = 2, hgap = 5, vgap = 5)
                  sizer.Add(wx.StaticText(dlg, -1, "%s:" % k), 0, wx.ALIGN_CENTER_VERTICAL)
                  sizer.Add(wx.StaticText(dlg, -1, "%s"  % trustDict[k]), 0, wx.ALIGN_CENTER_VERTICAL)
  
-diff -r 4d23a2d0e47a wxPython/samples/ide/activegrid/tool/checker.py
---- a/wxPython/samples/ide/activegrid/tool/checker.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/ide/activegrid/tool/checker.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/ide/activegrid/tool/checker.py
+--- a/wxPython/samples/ide/activegrid/tool/checker.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/ide/activegrid/tool/checker.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -858,7 +858,7 @@
  ##    def _get_unique_warnings(warnings):
  ##        for i in range(len(warnings)-1, -1, -1):
  ##        pymodule = _orig__import__(name, globals, locals, fromlist)
  ##        if check :
  ##            try :
-diff -r 4d23a2d0e47a wxPython/samples/ide/activegrid/tool/process.py
---- a/wxPython/samples/ide/activegrid/tool/process.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/ide/activegrid/tool/process.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/ide/activegrid/tool/process.py
+--- a/wxPython/samples/ide/activegrid/tool/process.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/ide/activegrid/tool/process.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -291,10 +291,7 @@
          else:
              return None
  
  
  def _whichFirstArg(cmd, env=None):
-diff -r 4d23a2d0e47a wxPython/samples/ide/activegrid/util/aglogging.py
---- a/wxPython/samples/ide/activegrid/util/aglogging.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/ide/activegrid/util/aglogging.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/ide/activegrid/util/aglogging.py
+--- a/wxPython/samples/ide/activegrid/util/aglogging.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/ide/activegrid/util/aglogging.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -188,7 +188,7 @@
              setattr(e, EXCEPTION_INFO, {})
          except:
          e.exceptionInfo[key] = value
              
  def reportException(exception, out=None, stacktrace=False, diffable=False):
-diff -r 4d23a2d0e47a wxPython/samples/ide/activegrid/util/fileutils.py
---- a/wxPython/samples/ide/activegrid/util/fileutils.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/ide/activegrid/util/fileutils.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/ide/activegrid/util/fileutils.py
+--- a/wxPython/samples/ide/activegrid/util/fileutils.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/ide/activegrid/util/fileutils.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -410,7 +410,7 @@
      if useEnv:
          for key, val in os.environ.items():
                  tokens[key] = val        
      
      f = open(infilepath, "r")
-diff -r 4d23a2d0e47a wxPython/samples/ide/activegrid/util/objutils.py
---- a/wxPython/samples/ide/activegrid/util/objutils.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/ide/activegrid/util/objutils.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/ide/activegrid/util/objutils.py
+--- a/wxPython/samples/ide/activegrid/util/objutils.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/ide/activegrid/util/objutils.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -31,7 +31,7 @@
          return False
      if name != FUNCTION_HAS_ATTR and hasattr(obj, FUNCTION_HAS_ATTR):
          return __builtin__.__dict__[typeName]
      return None
      
-diff -r 4d23a2d0e47a wxPython/samples/ide/activegrid/util/utillang.py
---- a/wxPython/samples/ide/activegrid/util/utillang.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/ide/activegrid/util/utillang.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/ide/activegrid/util/utillang.py
+--- a/wxPython/samples/ide/activegrid/util/utillang.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/ide/activegrid/util/utillang.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -75,9 +75,7 @@
      return tempfile.gettempdir()
  
                  return self.specialEntries[key]
              raise KeyError(e.args)
      def __setitem__(self, key, item): setattr(self.obj, key, item)
-diff -r 4d23a2d0e47a wxPython/samples/ide/activegrid/util/xmlmarshaller.py
---- a/wxPython/samples/ide/activegrid/util/xmlmarshaller.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/samples/ide/activegrid/util/xmlmarshaller.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/samples/ide/activegrid/util/xmlmarshaller.py
+--- a/wxPython/samples/ide/activegrid/util/xmlmarshaller.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/samples/ide/activegrid/util/xmlmarshaller.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -242,7 +242,7 @@
              else:
                  self.__xmlname__ = xmlName[i+1:]
                  obj = tuple(obj)
          endIfDef()
              
-diff -r 4d23a2d0e47a wxPython/sandbox/test_widgetLayout.py
---- a/wxPython/sandbox/test_widgetLayout.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/sandbox/test_widgetLayout.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/sandbox/test_widgetLayout.py
+--- a/wxPython/sandbox/test_widgetLayout.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/sandbox/test_widgetLayout.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -290,7 +290,7 @@
              postCreate = postCreate.replace('\r', '\n')
  
              try:
                  m = __import__(moduleName)
              except importError:
-diff -r 4d23a2d0e47a wxPython/src/_font.i
---- a/wxPython/src/_font.i	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/src/_font.i	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/src/_font.i
+--- a/wxPython/src/_font.i	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/src/_font.i	Mon Aug 30 11:29:29 2010 +0200
 @@ -514,7 +514,7 @@
  
  class wxFont : public wxGDIObject {
  
      DocCtorStr(
          wxFont( int pointSize,
-diff -r 4d23a2d0e47a wxPython/src/_radio.i
---- a/wxPython/src/_radio.i	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/src/_radio.i	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/src/_radio.i
+--- a/wxPython/src/_radio.i	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/src/_radio.i	Mon Aug 30 11:29:29 2010 +0200
 @@ -26,7 +26,7 @@
  class wxRadioBox : public wxControl
  {
      %pythonPrepend wxRadioBox()       ""
      %pythonAppend  wxRadioBox         "self._setOORInfo(self)"
      %pythonAppend  wxRadioBox()       ""
-diff -r 4d23a2d0e47a wxPython/src/_slider.i
---- a/wxPython/src/_slider.i	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/src/_slider.i	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/src/_slider.i
+--- a/wxPython/src/_slider.i	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/src/_slider.i	Mon Aug 30 11:29:29 2010 +0200
 @@ -47,7 +47,7 @@
  
  class wxSlider : public wxControl {
      %pythonPrepend wxSlider()       ""
      %pythonAppend  wxSlider         "self._setOORInfo(self)"
      %pythonAppend  wxSlider()       ""
-diff -r 4d23a2d0e47a wxPython/src/_splitter.i
---- a/wxPython/src/_splitter.i	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/src/_splitter.i	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/src/_splitter.i
+--- a/wxPython/src/_splitter.i	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/src/_splitter.i	Mon Aug 30 11:29:29 2010 +0200
 @@ -110,7 +110,7 @@
  class wxSplitterWindow: public wxWindow
  {
      %pythonPrepend wxSplitterWindow()       ""
      %pythonAppend  wxSplitterWindow         "self._setOORInfo(self)"
      %pythonAppend  wxSplitterWindow()       ""
-diff -r 4d23a2d0e47a wxPython/wxversion/wxversion.py
---- a/wxPython/wxversion/wxversion.py	Tue Aug 24 18:37:49 2010 +0200
-+++ b/wxPython/wxversion/wxversion.py	Wed Aug 25 10:56:28 2010 +0200
+diff -r 842c235557a2 wxPython/wx/lib/floatbar.py
+--- a/wxPython/wx/lib/floatbar.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/wx/lib/floatbar.py	Mon Aug 30 11:29:29 2010 +0200
+@@ -90,17 +90,11 @@
+             """
+             wx.ToolBar.__init__(self, parent, *_args, **_kwargs)
+             self.parentframe = parent
+-            if _kwargs.has_key('floatable'):
+-                self.floatable = _kwargs['floatable']
+-                assert type(self.floatable) == type(0)
+-            else:
+-                self.floatable = 0
++            self.floatable = _kwargs.get('floatable', 0)
++            assert isinstance(self.floatable, int)
+             self.floating = 0
+-            if _kwargs.has_key('title'):
+-                self.title = _kwargs['title']
+-                assert type(self.title) == type("")
+-            else:
+-                self.title = ""
++            self.title = _kwargs.get('title', "")
++            assert isinstance(self.title, str)
+             self.Bind(wx.EVT_MOUSE_EVENTS, self.OnMouse)
+ 
+ 
+diff -r 842c235557a2 wxPython/wxversion/wxversion.py
+--- a/wxPython/wxversion/wxversion.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/wxversion/wxversion.py	Mon Aug 30 11:29:29 2010 +0200
 @@ -140,7 +140,7 @@
  
      # If we get here then this is the first time wxversion is used, 

File modern-types-module.patch

-diff -r 02b5436ab2d3 wx/build/tools/build-wxwidgets.py
---- a/wx/build/tools/build-wxwidgets.py	Wed Aug 25 11:14:23 2010 +0200
-+++ b/wx/build/tools/build-wxwidgets.py	Wed Aug 25 11:39:08 2010 +0200
+diff -r 50cde9528064 wx/build/tools/build-wxwidgets.py
+--- a/wx/build/tools/build-wxwidgets.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wx/build/tools/build-wxwidgets.py	Mon Aug 30 11:15:18 2010 +0200
 @@ -14,7 +14,6 @@
  import optparse
  import platform
              action = "store_true"
          parser.add_option("--" + opt, default=default, action=action, dest=opt, help=option_dict[opt][1])
      
-diff -r 02b5436ab2d3 wxPython/build-wxpython.py
---- a/wxPython/build-wxpython.py	Wed Aug 25 11:14:23 2010 +0200
-+++ b/wxPython/build-wxpython.py	Wed Aug 25 11:39:08 2010 +0200
+diff -r 50cde9528064 wxPython/build-wxpython.py
+--- a/wxPython/build-wxpython.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/build-wxpython.py	Mon Aug 30 11:15:18 2010 +0200
 @@ -8,7 +8,6 @@
  import shutil
  import string
  import cfg_version as cfg
  
  from distutils.dep_util  import newer
-@@ -73,7 +72,7 @@
- for opt in sorted(option_dict):
+@@ -75,7 +74,7 @@
+ for opt in keys:
      default = option_dict[opt][0]
      action = "store"
 -    if type(default) == types.BooleanType:
          action = "store_true"
      if len(option_dict[opt]) > 2:
          # Even with the callback action we still have to workaround optparse's
+diff -r 50cde9528064 wxPython/wx/lib/filebrowsebutton.py
+--- a/wxPython/wx/lib/filebrowsebutton.py	Mon Aug 30 10:41:41 2010 +0200
++++ b/wxPython/wx/lib/filebrowsebutton.py	Mon Aug 30 11:15:18 2010 +0200
+@@ -17,7 +17,6 @@
+ #
+ 
+ import  os
+-import  types
+ 
+ import  wx
+ 
+@@ -104,9 +103,7 @@
+         self.SetAutoLayout(True)
+         self.SetSizer( outsidebox )
+         self.Layout()
+-        if type( size ) == types.TupleType:
+-            size = wx.Size( *size )
+-        self.SetDimensions(-1, -1, size.width, size.height, wx.SIZE_USE_EXISTING)
++        self.SetDimensions(-1, -1, size[0], size[1], wx.SIZE_USE_EXISTING)
+ 
+ #        if size.width != -1 or size.height != -1:
+ #            self.SetSize(size)

File py3k-callable.patch

+diff -r f9dac2b40703 wxPython/wx/lib/filebrowsebutton.py
+--- a/wxPython/wx/lib/filebrowsebutton.py	Mon Aug 30 11:15:28 2010 +0200
++++ b/wxPython/wx/lib/filebrowsebutton.py	Mon Aug 30 11:25:35 2010 +0200
+@@ -228,7 +228,7 @@
+             del namedarguments["history"]
+ 
+         self.historyCallBack=None
+-        if callable(self.history):
++        if hasattr(self.history, '__call__'):
+             self.historyCallBack=self.history
+             self.history=None
+         name = namedarguments.get('name', 'fileBrowseButtonWithHistory')

File py3k-compatible-imports.patch

-diff -r 87874edb04cb wx/build/tools/build-wxwidgets.py
---- a/wx/build/tools/build-wxwidgets.py	Fri Aug 27 13:29:50 2010 +0200
-+++ b/wx/build/tools/build-wxwidgets.py	Fri Aug 27 13:42:46 2010 +0200
+diff -r be2866f0e0c6 wx/build/tools/build-wxwidgets.py
+--- a/wx/build/tools/build-wxwidgets.py	Mon Aug 30 11:29:32 2010 +0200
++++ b/wx/build/tools/build-wxwidgets.py	Mon Aug 30 11:53:10 2010 +0200
 @@ -9,7 +9,7 @@
  import re
  import sys
          
          os.system("ln -s -f bin Resources")
          
-diff -r 87874edb04cb wxPython/build-wxpython.py
---- a/wxPython/build-wxpython.py	Fri Aug 27 13:29:50 2010 +0200
-+++ b/wxPython/build-wxpython.py	Fri Aug 27 13:42:46 2010 +0200
+diff -r be2866f0e0c6 wxPython/build-wxpython.py
+--- a/wxPython/build-wxpython.py	Mon Aug 30 11:29:32 2010 +0200
++++ b/wxPython/build-wxpython.py	Mon Aug 30 11:53:10 2010 +0200
 @@ -1,12 +1,14 @@
  #!/usr/bin/python
  
      
  if options.reswig:
      if not os.path.exists(SWIG_BIN) and not sys.platform.startswith("win"):
-diff -r 87874edb04cb wxPython/demo/Main.py
---- a/wxPython/demo/Main.py	Fri Aug 27 13:29:50 2010 +0200
-+++ b/wxPython/demo/Main.py	Fri Aug 27 13:42:46 2010 +0200
+diff -r be2866f0e0c6 wxPython/demo/Main.py
+--- a/wxPython/demo/Main.py	Mon Aug 30 11:29:32 2010 +0200
++++ b/wxPython/demo/Main.py	Mon Aug 30 11:53:10 2010 +0200
 @@ -52,9 +52,25 @@
  # Last updated: Andrea Gavana, 20 Oct 2008, 18.00 GMT
  
          fid.close()
  
          self.Destroy()
+diff -r be2866f0e0c6 wxPython/wx/lib/floatcanvas/Resources.py
+--- a/wxPython/wx/lib/floatcanvas/Resources.py	Mon Aug 30 11:29:32 2010 +0200
++++ b/wxPython/wx/lib/floatcanvas/Resources.py	Mon Aug 30 11:53:10 2010 +0200
+@@ -2,7 +2,11 @@
+ # This file was generated by /usr/local/bin/img2py
+ #
+ from wx import ImageFromStream, BitmapFromImage
+-import cStringIO, zlib
++import zlib
++try:
++    from cStringIO import StringIO as BytesIO
++except ImportError:
++    from io import BytesIO
+ 
+ 
+ def getMagPlusData():
+@@ -24,7 +28,7 @@
+     return BitmapFromImage(getMagPlusImage())
+ 
+ def getMagPlusImage():
+-    stream = cStringIO.StringIO(getMagPlusData())
++    stream = BytesIO(getMagPlusData())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -46,7 +50,7 @@
+     return BitmapFromImage(getPointerImage())
+ 
+ def getPointerImage():
+-    stream = cStringIO.StringIO(getPointerData())
++    stream = BytesIO(getPointerData())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -69,7 +73,7 @@
+     return BitmapFromImage(getMagMinusImage())
+ 
+ def getMagMinusImage():
+-    stream = cStringIO.StringIO(getMagMinusData())
++    stream = BytesIO(getMagMinusData())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -93,7 +97,7 @@
+     return BitmapFromImage(getMoveButtonImage())
+ 
+ def getMoveButtonImage():
+-    stream = cStringIO.StringIO(getMoveButtonData())
++    stream = BytesIO(getMoveButtonData())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -114,7 +118,7 @@
+     return BitmapFromImage(getMoveCursorImage())
+ 
+ def getMoveCursorImage():
+-    stream = cStringIO.StringIO(getMoveCursorData())
++    stream = BytesIO(getMoveCursorData())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -134,7 +138,7 @@
+     return BitmapFromImage(getMoveRLCursorImage())
+ 
+ def getMoveRLCursorImage():
+-    stream = cStringIO.StringIO(getMoveRLCursorData())
++    stream = BytesIO(getMoveRLCursorData())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -155,7 +159,7 @@
+     return BitmapFromImage(getMoveUDCursorImage())
+ 
+ def getMoveUDCursorImage():
+-    stream = cStringIO.StringIO(getMoveUDCursorData())
++    stream = BytesIO(getMoveUDCursorData())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -180,7 +184,7 @@
+     return BitmapFromImage(getGrabHandImage())
+ 
+ def getGrabHandImage():
+-    stream = cStringIO.StringIO(getGrabHandData())
++    stream = BytesIO(getGrabHandData())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -205,7 +209,7 @@
+     return BitmapFromImage(getHandImage())
+ 
+ def getHandImage():
+-    stream = cStringIO.StringIO(getHandData())
++    stream = BytesIO(getHandData())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -228,7 +232,7 @@
+     return BitmapFromImage(getGrabHand16Image())
+ 
+ def getGrabHand16Image():
+-    stream = cStringIO.StringIO(getGrabHand16Data())
++    stream = BytesIO(getGrabHand16Data())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -246,7 +250,7 @@
+     return BitmapFromImage(getMondrianImage())
+ 
+ def getMondrianImage():
+-    stream = cStringIO.StringIO(getMondrianData())
++    stream = BytesIO(getMondrianData())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -268,7 +272,7 @@
+     return BitmapFromImage(getHand16Image())
+ 
+ def getHand16Image():
+-    stream = cStringIO.StringIO(getHand16Data())
++    stream = BytesIO(getHand16Data())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -290,7 +294,7 @@
+     return BitmapFromImage(getMagPlus16Image())
+ 
+ def getMagPlus16Image():
+-    stream = cStringIO.StringIO(getMagPlus16Data())
++    stream = BytesIO(getMagPlus16Data())
+     return ImageFromStream(stream)
+ 
+ #----------------------------------------------------------------------
+@@ -311,6 +315,6 @@
+     return BitmapFromImage(getMagMinus16Image())
+ 
+ def getMagMinus16Image():
+-    stream = cStringIO.StringIO(getMagMinus16Data())
++    stream = BytesIO(getMagMinus16Data())
+     return ImageFromStream(stream)
+ 
+diff -r be2866f0e0c6 wxPython/wx/lib/floatcanvas/ScreenShot.py
+--- a/wxPython/wx/lib/floatcanvas/ScreenShot.py	Mon Aug 30 11:29:32 2010 +0200
++++ b/wxPython/wx/lib/floatcanvas/ScreenShot.py	Mon Aug 30 11:53:10 2010 +0200
+@@ -2,7 +2,11 @@
+ # This file was generated by /usr/local/bin/img2py
+ #
+ from wx import ImageFromStream, BitmapFromImage
+-import cStringIO, zlib
++import zlib
++try:
++    from cStringIO import StringIO as BytesIO
++except ImportError:
++    from io import BytesIO
+ 
+ 
+ def getScreenShotData():
+@@ -1780,6 +1784,6 @@
+     return BitmapFromImage(getScreenShotImage())
+ 
+ def getScreenShotImage():
+-    stream = cStringIO.StringIO(getScreenShotData())
++    stream = BytesIO(getScreenShotData())
+     return ImageFromStream(stream)
+ 

File py3k-compatible-single-print.patch

-diff -r b63b1bae6409 wx/build/tools/build-wxwidgets.py
---- a/wx/build/tools/build-wxwidgets.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wx/build/tools/build-wxwidgets.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wx/build/tools/build-wxwidgets.py
+--- a/wx/build/tools/build-wxwidgets.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wx/build/tools/build-wxwidgets.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -29,7 +29,7 @@
  
  def exitIfError(code, msg):
              os.system("mv -f %s lib/%s.dylib" % (reallib, frameworkname))
              
              for link in links:
-diff -r b63b1bae6409 wx/build/tools/builder.py
---- a/wx/build/tools/builder.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wx/build/tools/builder.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wx/build/tools/builder.py
+--- a/wx/build/tools/builder.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wx/build/tools/builder.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -18,7 +18,7 @@
  
      commandStr = " ".join(command)
          result = os.system(command)
          #os.chdir(olddir)
          return result
-diff -r b63b1bae6409 wxPython/build-wxpython.py
---- a/wxPython/build-wxpython.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/build-wxpython.py	Thu Aug 26 15:47:18 2010 +0200
-@@ -96,7 +96,7 @@
+diff -r c909424c6862 wxPython/build-wxpython.py
+--- a/wxPython/build-wxpython.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/build-wxpython.py	Mon Aug 30 11:27:01 2010 +0200
+@@ -98,7 +98,7 @@
  # order to also match.  
  if sys.argv[1:] == old_options:
      options_changed = False
  
  cache_file = open("build-options.cache", "wb")
  cPickle.dump(sys.argv[1:], cache_file)
-@@ -109,24 +109,24 @@
+@@ -111,24 +111,24 @@
  def deleteIfExists(deldir, verbose=True):
      if os.path.exists(deldir) and os.path.isdir(deldir):
          if verbose:
          sys.exit(1)
          
  #---------------------------------------------------------------------------
-@@ -157,7 +157,7 @@
+@@ -159,7 +159,7 @@
          wxpy_build_options.append("USE_SWIG=%d" % 1)
      else:
          wxpy_build_options.append("USE_SWIG=%d" % 0)
  
      
  if "WXWIN" in os.environ:
-@@ -209,7 +209,7 @@
+@@ -211,7 +211,7 @@
      
      delFiles(files)
  
  
  if sys.platform.startswith("win"):
      if CPU == 'AMD64':
-@@ -322,10 +322,10 @@
+@@ -324,10 +324,10 @@
      wxscript = os.path.join(WXWIN, "build/tools/build-wxwidgets.py")
      sys.path.insert(0, os.path.dirname(wxscript))
      wxbuild = __import__('build-wxwidgets')
      import traceback
      traceback.print_exc()
      sys.exit(1)
-@@ -377,7 +377,7 @@
+@@ -379,7 +379,7 @@
      for lib in dylibs:
          cmd = 'install_name_tool -change %s/lib/%s %s/lib/%s %s' % \
                (destdir+prefix,lib,  prefix,lib,  extension)
          os.system(cmd)        
      os.chdir(pwd)
      
-@@ -421,11 +421,11 @@
+@@ -423,11 +423,11 @@
      if not sys.platform.startswith("win"):
          if options.install:
              wxlocation = DESTDIR + PREFIX
              wxpy_build_options.append('WX_CONFIG="%s/bin/wx-config --prefix=%s"' %
                                        (wxlocation, wxlocation))
          else:
-@@ -459,13 +459,13 @@
+@@ -461,13 +461,13 @@
  exitIfError(runCmd(command), "ERROR: failed generating language files")
  
  
 +print(" - Run python demo/demo.py")
 +print("")
  
-diff -r b63b1bae6409 wxPython/config.py
---- a/wxPython/config.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/config.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/config.py
+--- a/wxPython/config.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/config.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -32,7 +32,7 @@
          ez_setup.use_setuptools()
          from setuptools import setup, Extension
      
  
  #----------------------------------------------------------------------
-diff -r b63b1bae6409 wxPython/demo/ComboBox.py
---- a/wxPython/demo/ComboBox.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/ComboBox.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/ComboBox.py
+--- a/wxPython/demo/ComboBox.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/ComboBox.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -5,11 +5,11 @@
  
  class TestComboBox(wx.Panel):
          evt.Skip()
  
      def __init__(self, parent, log):
-diff -r b63b1bae6409 wxPython/demo/FloatBar.py
---- a/wxPython/demo/FloatBar.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/FloatBar.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/FloatBar.py
+--- a/wxPython/demo/FloatBar.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/FloatBar.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -74,7 +74,7 @@
          self.log.WriteText("tool %s clicked\n" % event.GetId())
  
  
              if event.GetExtraLong():
                  self.tb.SetTitle("")
-diff -r b63b1bae6409 wxPython/demo/FloatCanvas.py
---- a/wxPython/demo/FloatCanvas.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/FloatCanvas.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/FloatCanvas.py
+--- a/wxPython/demo/FloatCanvas.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/FloatCanvas.py	Mon Aug 30 11:27:01 2010 +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 b63b1bae6409 wxPython/demo/GridBagSizer.py
---- a/wxPython/demo/GridBagSizer.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/GridBagSizer.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/GridBagSizer.py
+--- a/wxPython/demo/GridBagSizer.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/GridBagSizer.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -118,9 +118,9 @@
          pt = evt.GetPosition()
          item = self.gbs.FindItemAtPoint(pt)
  
          
  #---------------------------------------------------------------------------
-diff -r b63b1bae6409 wxPython/demo/GridCustTable.py
---- a/wxPython/demo/GridCustTable.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/GridCustTable.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/GridCustTable.py
+--- a/wxPython/demo/GridCustTable.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/GridCustTable.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -154,10 +154,10 @@
          p.SetSizer(bs)
  
  
  
  #---------------------------------------------------------------------------
-diff -r b63b1bae6409 wxPython/demo/GridHugeTable.py
---- a/wxPython/demo/GridHugeTable.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/GridHugeTable.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/GridHugeTable.py
+--- a/wxPython/demo/GridHugeTable.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/GridHugeTable.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -61,8 +61,8 @@
          self.Bind(gridlib.EVT_GRID_CELL_RIGHT_CLICK, self.OnRightDown)  
  
  
  
  #---------------------------------------------------------------------------
-diff -r b63b1bae6409 wxPython/demo/ListCtrl.py
---- a/wxPython/demo/ListCtrl.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/ListCtrl.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/ListCtrl.py
+--- a/wxPython/demo/ListCtrl.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/ListCtrl.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -335,8 +335,8 @@
  
      def OnPopupOne(self, event):
  
      def OnPopupSix(self, event):
          self.list.EditLabel(self.currentItem)
-diff -r b63b1bae6409 wxPython/demo/Main.py
---- a/wxPython/demo/Main.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/Main.py	Thu Aug 26 15:47:18 2010 +0200
-@@ -2474,10 +2474,10 @@
+diff -r c909424c6862 wxPython/demo/Main.py
+--- a/wxPython/demo/Main.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/Main.py	Mon Aug 30 11:27:01 2010 +0200
+@@ -2475,10 +2475,10 @@
          app = wx.GetApp()
          if event.Checked():
              app.RedirectStdio()
  
  
      def OnAllowDownload(self, event):
-diff -r b63b1bae6409 wxPython/demo/MiniFrame.py
---- a/wxPython/demo/MiniFrame.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/MiniFrame.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/MiniFrame.py
+--- a/wxPython/demo/MiniFrame.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/MiniFrame.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -20,7 +20,7 @@
          self.Close(True)
  
          self.Destroy()
  
  #---------------------------------------------------------------------------
-diff -r b63b1bae6409 wxPython/demo/OGL.py
---- a/wxPython/demo/OGL.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/OGL.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/OGL.py
+--- a/wxPython/demo/OGL.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/OGL.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -181,7 +181,7 @@
  
  
          ogl.DividedShape.OnSizingEndDragLeft(self, pt, x, y, keys, attch)
          self.SetRegionSizes()
          self.ReformatRegions()
-diff -r b63b1bae6409 wxPython/demo/PlateButton.py
---- a/wxPython/demo/PlateButton.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/PlateButton.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/PlateButton.py
+--- a/wxPython/demo/PlateButton.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/PlateButton.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -253,7 +253,7 @@
          pass
  
  
  #----------------------------------------------------------------------
  
-diff -r b63b1bae6409 wxPython/demo/SizedControls.py
---- a/wxPython/demo/SizedControls.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/SizedControls.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/SizedControls.py
+--- a/wxPython/demo/SizedControls.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/SizedControls.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -270,7 +270,7 @@
          
  
          dlg = FormDialog(self, -1)
          dlg.CenterOnScreen()
  
-diff -r b63b1bae6409 wxPython/demo/StyledTextCtrl_1.py
---- a/wxPython/demo/StyledTextCtrl_1.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/StyledTextCtrl_1.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/StyledTextCtrl_1.py
+--- a/wxPython/demo/StyledTextCtrl_1.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/StyledTextCtrl_1.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -268,27 +268,26 @@
  
      # some test stuff...
  
  
      wx.CallAfter(ed.GotoPos, 0)
-diff -r b63b1bae6409 wxPython/demo/SystemSettings.py
---- a/wxPython/demo/SystemSettings.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/SystemSettings.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/SystemSettings.py
+--- a/wxPython/demo/SystemSettings.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/SystemSettings.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -301,7 +301,7 @@
          pass
  
  
  #----------------------------------------------------------------------
  
-diff -r b63b1bae6409 wxPython/demo/TextCtrl.py
---- a/wxPython/demo/TextCtrl.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/TextCtrl.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/TextCtrl.py
+--- a/wxPython/demo/TextCtrl.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/TextCtrl.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -6,13 +6,13 @@
  
  class TestPanel(wx.Panel):
          evt.Skip()
  
  
-diff -r b63b1bae6409 wxPython/demo/TimeCtrl.py
---- a/wxPython/demo/TimeCtrl.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/TimeCtrl.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/TimeCtrl.py
+--- a/wxPython/demo/TimeCtrl.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/TimeCtrl.py	Mon Aug 30 11:27:01 2010 +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 b63b1bae6409 wxPython/demo/UIActionSimulator.py
---- a/wxPython/demo/UIActionSimulator.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/UIActionSimulator.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/UIActionSimulator.py
+--- a/wxPython/demo/UIActionSimulator.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/UIActionSimulator.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -94,7 +94,7 @@
      def _setNextKeyEvent(self):
          evtType, key, shift, cmd, alt, milli = self._playbackEvents.pop(0)
          wx.CallLater(milli, self._playbackKey, evtType, key, shift, cmd, alt)
              
      
-diff -r b63b1bae6409 wxPython/demo/XMLtreeview.py
---- a/wxPython/demo/XMLtreeview.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/XMLtreeview.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/XMLtreeview.py
+--- a/wxPython/demo/XMLtreeview.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/XMLtreeview.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -44,11 +44,11 @@
          self.draggingItem = None
  
              return
  
          # For this simple example just take the text of the source item
-diff -r b63b1bae6409 wxPython/demo/agw/ListCtrl.py
---- a/wxPython/demo/agw/ListCtrl.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/agw/ListCtrl.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/agw/ListCtrl.py
+--- a/wxPython/demo/agw/ListCtrl.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/agw/ListCtrl.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -335,8 +335,8 @@
  
      def OnPopupOne(self, event):
  
      def OnPopupSix(self, event):
          self.list.EditLabel(self.currentItem)
-diff -r b63b1bae6409 wxPython/demo/agw/run.py
---- a/wxPython/demo/agw/run.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/agw/run.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/agw/run.py
+--- a/wxPython/demo/agw/run.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/agw/run.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -23,8 +23,8 @@
  import sys, os
  
          raise SystemExit
  
      name, ext  = os.path.splitext(argv[1])
-diff -r b63b1bae6409 wxPython/demo/dllwidget/test_prog.py
---- a/wxPython/demo/dllwidget/test_prog.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/dllwidget/test_prog.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/dllwidget/test_prog.py
+--- a/wxPython/demo/dllwidget/test_prog.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/dllwidget/test_prog.py	Mon Aug 30 11:27:01 2010 +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 b63b1bae6409 wxPython/demo/infoframe.py
---- a/wxPython/demo/infoframe.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/infoframe.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/infoframe.py
+--- a/wxPython/demo/infoframe.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/infoframe.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -51,7 +51,7 @@
          # Now point to the output object for stdout
          sys.stdout = self.output = output
              return True
  
      # *extremely important*
-diff -r b63b1bae6409 wxPython/demo/run.py
---- a/wxPython/demo/run.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/demo/run.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/demo/run.py
+--- a/wxPython/demo/run.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/demo/run.py	Mon Aug 30 11:27:01 2010 +0200
 @@ -23,9 +23,9 @@
  import sys, os
  
          raise SystemExit
  
      name, ext  = os.path.splitext(argv[1])
-diff -r b63b1bae6409 wxPython/distrib/makemo.py
---- a/wxPython/distrib/makemo.py	Wed Aug 25 15:09:09 2010 +0200
-+++ b/wxPython/distrib/makemo.py	Thu Aug 26 15:47:18 2010 +0200
+diff -r c909424c6862 wxPython/distrib/makemo.py
+--- a/wxPython/distrib/makemo.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/distrib/makemo.py	Mon Aug 30 11:27:01 2010 +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 c909424c6862 wxPython/wx/lib/filebrowsebutton.py
+--- a/wxPython/wx/lib/filebrowsebutton.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/wx/lib/filebrowsebutton.py	Mon Aug 30 11:27:01 2010 +0200
+@@ -371,7 +371,7 @@
+         def __init__( self, tag ):
+             self.tag = tag
+         def __call__( self, event ):
+-            print self.tag, event.GetString()
++            print(self.tag, event.GetString())
+     class DemoFrame( wx.Frame ):
+         def __init__(self, parent):
+             wx.Frame.__init__(self, parent, -1, "File entry with browse", size=(500,260))
+@@ -450,7 +450,7 @@
+     def test( ):
+         app = DemoApp(0)
+         app.MainLoop()
+-    print 'Creating dialog'
++    print('Creating dialog')
+     test( )
+ 
+ 
+diff -r c909424c6862 wxPython/wx/lib/floatbar.py
+--- a/wxPython/wx/lib/floatbar.py	Mon Aug 30 11:15:26 2010 +0200
++++ b/wxPython/wx/lib/floatbar.py	Mon Aug 30 11:27:01 2010 +0200
+@@ -131,7 +131,7 @@
+ 
+ 
+         def SetTitle(self, title):
+-            print 'SetTitle', title
++            print('SetTitle: %s' % (title,))
+             self.title = title
+             if self.IsFloating():
+                 self.floatframe.SetTitle(self.title)
+@@ -175,7 +175,7 @@
+             "Floats or docks the toolbar programmatically."
+             if bool:
+                 self.parentframe = self.GetParent()
+-                print self.title
++                print(self.title)
+                 if self.title:
+                     useStyle = wx.DEFAULT_FRAME_STYLE
+                 else:
+@@ -282,23 +282,23 @@
+                 if self.parentframe.GetToolBar() == None:
+                     if not hasattr(self, 'nullbar'):
+                         self.nullbar = wx.ToolBar(self.parentframe, -1)
+-                    print "Adding fauxbar."
++                    print("Adding fauxbar.")
+                     self.nullbar.Reparent(self.parentframe)
+-                    print "Reparented."
++                    print("Reparented.")
+                     self.parentframe.SetToolBar(self.nullbar)
+-                    print "Set toolbar"
++                    print("Set toolbar")
+                     col = wx.NamedColour("GREY")
+                     self.nullbar.SetBackgroundColour(col)
+-                    print "Set color"
++                    print("Set color")
+                     size = self.parentframe.GetSize()
+                     self.parentframe.SetSize((0,0))
+                     self.parentframe.SetSize(size)
+-                    print "Set size"
++                    print("Set size")
+                 else:
+-                    print self.parentframe.GetToolBar()
++                    print(self.parentframe.GetToolBar())
+             else:
+                 if self.parentframe.GetToolBar() != None:
+-                    print "Removing fauxbar"
++                    print("Removing fauxbar")
+                     self.nullbar.Reparent(self.floatframe)
+                     self.parentframe.SetToolBar(None)
+                     size = self.parentframe.GetSize()

File py3k-except-as.patch

-diff -r 35fb3401ec7c wxPython/config.py
---- a/wxPython/config.py	Thu Aug 26 11:43:38 2010 +0200
-+++ b/wxPython/config.py	Thu Aug 26 12:00:57 2010 +0200
+diff -r 70db534b372d wxPython/config.py
+--- a/wxPython/config.py	Mon Aug 30 10:41:42 2010 +0200
++++ b/wxPython/config.py	Mon Aug 30 10:45:41 2010 +0200
 @@ -781,7 +781,8 @@
          try:
              self.spawn(compiler_so + cc_args + [src, '-o', obj] +
              raise CompileError(msg)
  
  distutils.cygwinccompiler.CygwinCCompiler._compile = _compile
-diff -r 35fb3401ec7c wxPython/demo/Main.py
---- a/wxPython/demo/Main.py	Thu Aug 26 11:43:38 2010 +0200
-+++ b/wxPython/demo/Main.py	Thu Aug 26 12:00:57 2010 +0200
-@@ -651,7 +651,7 @@
+diff -r 70db534b372d wxPython/demo/Main.py
+--- a/wxPython/demo/Main.py	Mon Aug 30 10:41:42 2010 +0200
++++ b/wxPython/demo/Main.py	Mon Aug 30 10:45:41 2010 +0200
+@@ -668,7 +668,7 @@
                  return
              
              wx.CallAfter(self.notifyWindow.LoadDocumentation, data)
              # Unable to get to the internet
              t, v = sys.exc_info()[:2]
              message = traceback.format_exception_only(t, v)
+diff -r 70db534b372d wxPython/src/__init__.py
+--- a/wxPython/src/__init__.py	Mon Aug 30 10:41:42 2010 +0200
++++ b/wxPython/src/__init__.py	Mon Aug 30 10:45:41 2010 +0200
+@@ -50,6 +50,9 @@
+     from sys import maxsize
+ except ImportError:
+     from sys import maxint as maxsize
++def getCurrentException():
++    import sys
++    return sys.exc_info()[1]
+ 
+ if 'wxMSW' in PlatformInfo:
+     __all__ += ['activex']
+diff -r 70db534b372d wxPython/wx/lib/fancytext.py
+--- a/wxPython/wx/lib/fancytext.py	Mon Aug 30 10:41:42 2010 +0200
++++ b/wxPython/wx/lib/fancytext.py	Mon Aug 30 10:45:41 2010 +0200
+@@ -327,8 +327,9 @@
+         p.EndElementHandler = renderer.endElement
+         p.CharacterDataHandler = renderer.characterData
+         p.Parse(str, 1)
+-    except xml.parsers.expat.error, err:
+-        raise ValueError('error parsing text text "%s": %s' % (str, err)) 
++    except xml.parsers.expat.error:
++        raise ValueError('error parsing text text "%s": %s' % (
++            str, wx.getCurrentException()))
+ 
+ 
+ # Public interface

File py3k-stdlib.patch

+diff -r 8a49d00ad76c wxPython/wx/lib/fancytext.py
+--- a/wxPython/wx/lib/fancytext.py	Mon Aug 30 10:45:46 2010 +0200
++++ b/wxPython/wx/lib/fancytext.py	Mon Aug 30 10:56:27 2010 +0200
+@@ -322,7 +322,8 @@
+         if enclose:
+             str = '<?xml version="1.0"?><FancyText>%s</FancyText>' % str
+         p = xml.parsers.expat.ParserCreate()
+-        p.returns_unicode = 0
++        if sys.version < '3':
++            p.returns_unicode = 0
+         p.StartElementHandler = renderer.startElement
+         p.EndElementHandler = renderer.endElement
+         p.CharacterDataHandler = renderer.characterData
 py3k-__next__.patch
 dict-keys.patch
 modern-long.patch
+py3k-stdlib.patch
+py3k-callable.patch