python3 works.

Author: 赖勇浩

Pipfile

@@ -0,0 +1,13 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+
+[packages]
+
+
+
+[dev-packages]
+

trunk/pytune/pytune/cakychart.py

@@ -107,7 +107,7 @@ def update_param(self):
 			|                       |
 			|-----------------------|
 		'''
-		w, h = self.GetClientSizeTuple()
+		w, h = self.GetClientSize()
 		mid = w/4*3
 		self.back_rect = (mid, 0, TITLE_HEIGHT*2, TITLE_HEIGHT)
 		self.forward_rect = (mid + TITLE_HEIGHT*2, 0, TITLE_HEIGHT*2, TITLE_HEIGHT)
@@ -323,4 +323,4 @@ def get_valid_text(self, text, dc, w):
 	#cc = wx.ScrolledWindow(frame, wx.ID_ANY, (0,0), style=wx.SUNKEN_BORDER)
 	frame.Centre()
 	frame.Show(True)
-	app.MainLoop()
+	app.MainLoop()

trunk/pytune/pytune/cakychartactionpanel.py

@@ -3,7 +3,7 @@
 import wx
 
 class CakyChartActionPanel(wx.Panel):
-        def __init__(self, *a, **k):
+	def __init__(self, *a, **k):
 		super(CakyChartActionPanel, self).__init__(*a, **k)
 		box = wx.BoxSizer(wx.HORIZONTAL)
 		self.st = wx.StaticText(self, wx.ID_ANY, '', style = wx.ALIGN_CENTER | wx.ST_NO_AUTORESIZE)
@@ -34,10 +34,10 @@ def __init__(self, *a, **k):
 	def resetTitle(self, title):
 		self.st.SetLabel(title)
 
-        def OnRedo(self, evt):
-                self.redo_callback()
+	def OnRedo(self, evt):
+		self.redo_callback()
+
+	def OnUndo(self, evt):
+		self.undo_callback()
 
-        def OnUndo(self, evt):
-                self.undo_callback()
 
-

trunk/pytune/pytune/list_mixin.py

@@ -3,38 +3,40 @@
 import wx
 import io
 
+
 #----------------------------------------------------------------------
 def getSmallUpArrowData():
     return \
-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
 \x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
 \x00\x00<IDAT8\x8dcddbf\xa0\x040Q\xa4{h\x18\xf0\xff\xdf\xdf\xffd\x1b\x00\xd3\
 \x8c\xcf\x10\x9c\x06\xa0k\xc2e\x08m\xc2\x00\x97m\xd8\xc41\x0c \x14h\xe8\xf2\
 \x8c\xa3)q\x10\x18\x00\x00R\xd8#\xec\xb2\xcd\xc1Y\x00\x00\x00\x00IEND\xaeB`\
 \x82' 
 
 def getSmallUpArrowBitmap():
-    return wx.BitmapFromImage(getSmallUpArrowImage())
+    return wx.Bitmap(getSmallUpArrowImage())
 
 def getSmallUpArrowImage():
-    stream = io.StringIO(getSmallUpArrowData())
+    stream = io.BytesIO(getSmallUpArrowData())
     return wx.ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getSmallDnArrowData():
     return \
-"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
 \x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
 \x00\x00HIDAT8\x8dcddbf\xa0\x040Q\xa4{\xd4\x00\x06\x06\x06\x06\x06\x16t\x81\
 \xff\xff\xfe\xfe'\xa4\x89\x91\x89\x99\x11\xa7\x0b\x90%\ti\xc6j\x00>C\xb0\x89\
 \xd3.\x10\xd1m\xc3\xe5*\xbc.\x80i\xc2\x17.\x8c\xa3y\x81\x01\x00\xa1\x0e\x04e\
 ?\x84B\xef\x00\x00\x00\x00IEND\xaeB`\x82" 
 
 def getSmallDnArrowBitmap():
-    return wx.BitmapFromImage(getSmallDnArrowImage())
+    # return wx.BitmapFromImage(getSmallDnArrowImage())
+	return wx.Bitmap(getSmallDnArrowImage())
 
 def getSmallDnArrowImage():
-    stream = io.StringIO(getSmallDnArrowData())
+    stream = io.BytesIO(getSmallDnArrowData())
     return wx.ImageFromStream(stream)
 
 DESCENDING = True
@@ -78,6 +80,14 @@ def _ColSorter(self, key1, key2):
 	def _GetText(self, idx, col):
 		return self.GetItem(idx, col).GetText()
 
+def cmp(a, b):
+	if a < b:
+		return -1
+	elif a > b:
+		return 1
+	else:
+		return 0
+
 str_cmp = cmp
 
 def int_cmp(str1, str2):
@@ -92,4 +102,4 @@ def __init__(self):
 
 	def reset(self, data, needreplace = True):
 		if needreplace:
-			self.data = data
+			self.data = data

trunk/pytune/pytune/ui.py

@@ -50,8 +50,8 @@ def _open(evt):
 			dlg = wx.FileDialog( \
 				frm, message = 'Open profile stats file', \
 				defaultDir = frm.GetDirCtrlFilePath(), defaultFile = '', \
-				wildcard = 'All files (*.*) | *.*', \
-				style = wx.OPEN | wx.CHANGE_DIR )
+				# wildcard = 'All files (*.*) | *.*', \
+				style = wx.FD_OPEN)
 			if dlg.ShowModal() != wx.ID_OK:
 				return
 			path = dlg.GetPath()
@@ -422,4 +422,4 @@ def createUI(*a, **k):
 
 	return obj
 
-
+

trunk/pytune/pytune/vpt.py

@@ -17,11 +17,11 @@ def try_psyco():
 
 def main():
 	try_psyco()
-	app = wx.PySimpleApp()
+	app = wx.App() #wx.PySimpleApp()
 	frame = ui.createUI(None, wx.ID_ANY, name + ' ' + ver)
 #	frame = ui.createUI(None, wx.ID_ANY, name)
 	app.MainLoop()
 
 if __name__ == '__main__':
 	main()
-
+

trunk/pytune/setup.py

@@ -24,7 +24,7 @@
           # -*- Extra requirements: -*-
       ],
       setup_requires = [
-      	'versiontools >= 1.8',
+      	'versiontools',
       ],
       entry_points="""
       # -*- Entry points: -*-