1. Amaury Forgeot d'Arc
  2. wxPython-py3k

Commits

Amaury Forgeot d'Arc  committed 56e7835

Resolve patch conflict

  • Participants
  • Parent commits 30a8a0d
  • Branches default

Comments (0)

Files changed (1)

File dict-keys.patch

View file
 dict.keys() &co return a view
 
-diff -r ca02cf5a653c wxPython/build-wxpython.py
---- a/wxPython/build-wxpython.py	Fri Aug 27 14:14:12 2010 +0200
-+++ b/wxPython/build-wxpython.py	Fri Aug 27 14:14:56 2010 +0200
+diff -r 0bf41962a1aa wxPython/build-wxpython.py
+--- a/wxPython/build-wxpython.py	Mon Aug 30 10:10:52 2010 +0200
++++ b/wxPython/build-wxpython.py	Mon Aug 30 10:12:31 2010 +0200
 @@ -71,9 +71,7 @@
  
  parser = optparse.OptionParser(usage="usage: %prog [options]", version="%prog 1.0")
      default = option_dict[opt][0]
      action = "store"
      if isinstance(default, bool):
-diff -r ca02cf5a653c wxPython/demo/CheckListCtrlMixin.py
---- a/wxPython/demo/CheckListCtrlMixin.py	Fri Aug 27 14:14:12 2010 +0200
-+++ b/wxPython/demo/CheckListCtrlMixin.py	Fri Aug 27 14:14:56 2010 +0200
+diff -r 0bf41962a1aa wxPython/demo/CheckListCtrlMixin.py
+--- a/wxPython/demo/CheckListCtrlMixin.py	Mon Aug 30 10:10:52 2010 +0200
++++ b/wxPython/demo/CheckListCtrlMixin.py	Mon Aug 30 10:12:31 2010 +0200
 @@ -44,7 +44,7 @@
          self.list.InsertColumn(1, "Title", wx.LIST_FORMAT_RIGHT)
          self.list.InsertColumn(2, "Genre")
  
 -        for key, data in musicdata.iteritems():
 +        for key, data in musicdata.items():
-             index = self.list.InsertStringItem(sys.maxint, data[0])
+             index = self.list.InsertStringItem(wx.maxsize, data[0])
              self.list.SetStringItem(index, 1, data[1])
              self.list.SetStringItem(index, 2, data[2])
-diff -r ca02cf5a653c wxPython/demo/DVC_DataViewModel.py
---- a/wxPython/demo/DVC_DataViewModel.py	Fri Aug 27 14:14:12 2010 +0200
-+++ b/wxPython/demo/DVC_DataViewModel.py	Fri Aug 27 14:14:56 2010 +0200
+diff -r 0bf41962a1aa wxPython/demo/DVC_DataViewModel.py
+--- a/wxPython/demo/DVC_DataViewModel.py	Mon Aug 30 10:10:52 2010 +0200
++++ b/wxPython/demo/DVC_DataViewModel.py	Mon Aug 30 10:12:31 2010 +0200
 @@ -220,8 +220,7 @@
      # Reuse the music data in the ListCtrl sample, and put it in a
      # hierarchical structure so we can show it as a tree
      # our data structure will be a collection of Genres, each of which is a
      # collection of Songs
      data = dict()
-diff -r ca02cf5a653c wxPython/demo/DVC_IndexListModel.py
---- a/wxPython/demo/DVC_IndexListModel.py	Fri Aug 27 14:14:12 2010 +0200
-+++ b/wxPython/demo/DVC_IndexListModel.py	Fri Aug 27 14:14:56 2010 +0200
+diff -r 0bf41962a1aa wxPython/demo/DVC_IndexListModel.py
+--- a/wxPython/demo/DVC_IndexListModel.py	Mon Aug 30 10:10:52 2010 +0200
++++ b/wxPython/demo/DVC_IndexListModel.py	Mon Aug 30 10:12:31 2010 +0200
 @@ -205,9 +205,7 @@
      # from a dictionary to a list of lists, including the dictionary key
      # as the first element of each sublist.
  
      win = TestPanel(nb, log, data=musicdata)
      return win
-diff -r ca02cf5a653c wxPython/demo/DVC_ListCtrl.py
---- a/wxPython/demo/DVC_ListCtrl.py	Fri Aug 27 14:14:12 2010 +0200
-+++ b/wxPython/demo/DVC_ListCtrl.py	Fri Aug 27 14:14:56 2010 +0200
+diff -r 0bf41962a1aa wxPython/demo/DVC_ListCtrl.py
+--- a/wxPython/demo/DVC_ListCtrl.py	Mon Aug 30 10:10:52 2010 +0200
++++ b/wxPython/demo/DVC_ListCtrl.py	Mon Aug 30 10:12:31 2010 +0200
 @@ -6,9 +6,7 @@
  
  # Reuse the music data in the ListCtrl sample
  
  
  class TestPanel(wx.Panel):
-diff -r ca02cf5a653c wxPython/demo/Grid.py
---- a/wxPython/demo/Grid.py	Fri Aug 27 14:14:12 2010 +0200
-+++ b/wxPython/demo/Grid.py	Fri Aug 27 14:14:56 2010 +0200
+diff -r 0bf41962a1aa wxPython/demo/Grid.py
+--- a/wxPython/demo/Grid.py	Mon Aug 30 10:10:52 2010 +0200
++++ b/wxPython/demo/Grid.py	Mon Aug 30 10:12:31 2010 +0200
 @@ -22,10 +22,8 @@
  
          box = wx.BoxSizer(wx.VERTICAL)
              text = buttonDefs[k][1]
              btn = wx.Button(self, k, text)
              box.Add(btn, 0, wx.ALIGN_CENTER|wx.ALL, 10)
-diff -r ca02cf5a653c wxPython/demo/Main.py
---- a/wxPython/demo/Main.py	Fri Aug 27 14:14:12 2010 +0200
-+++ b/wxPython/demo/Main.py	Fri Aug 27 14:14:56 2010 +0200
+diff -r 0bf41962a1aa wxPython/demo/Main.py
+--- a/wxPython/demo/Main.py	Mon Aug 30 10:10:52 2010 +0200
++++ b/wxPython/demo/Main.py	Mon Aug 30 10:12:31 2010 +0200
 @@ -440,8 +440,7 @@
  
  def FormatDocs(keyword, values, num):