mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2025-12-15 17:20:07 +01:00
remove most of Python2 compatibility code
This commit is contained in:
committed by
Scott Talbert
parent
beb9932241
commit
0257f755cf
@@ -11,8 +11,7 @@ implemented using an wx.html.HtmlWindow.
|
||||
|
||||
import sys
|
||||
import os
|
||||
|
||||
from six.moves import cPickle as pickle
|
||||
import pickle
|
||||
|
||||
import wx
|
||||
import wx.html
|
||||
|
||||
@@ -14,7 +14,6 @@ I think it's easier with FloatCavnas, and you get zoomign and scrolling to boot!
|
||||
"""
|
||||
|
||||
import wx
|
||||
from six import moves
|
||||
from math import *
|
||||
|
||||
try: # see if there is a local FloatCanvas to use
|
||||
@@ -54,7 +53,7 @@ class DrawFrame(wx.Frame):
|
||||
Canvas = self.Canvas
|
||||
phi = (sqrt(5) + 1)/2 - 1
|
||||
oradius = 10.0
|
||||
for i in moves.xrange(720):
|
||||
for i in range(720):
|
||||
radius = 1.5 * oradius * sin(i * pi/720)
|
||||
Color = (255*(i / 720.), 255*( i / 720.), 255 * 0.25)
|
||||
x = oradius + 0.25*i*cos(phi*i*2*pi)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import sys
|
||||
import os
|
||||
from six import BytesIO
|
||||
from io import BytesIO
|
||||
|
||||
import wx
|
||||
import wx.html2 as webview
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
from __future__ import print_function
|
||||
|
||||
import wx
|
||||
import os
|
||||
|
||||
|
||||
@@ -36,8 +36,6 @@
|
||||
# ideal Roses program should be, however, callers are welcome to assert their
|
||||
# independence, override defaults, ignore features, etc.
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
from math import sin, cos, pi
|
||||
|
||||
# Rose class knows about:
|
||||
|
||||
@@ -68,8 +68,6 @@
|
||||
# control the display (without blocking the user's control) would be pretty
|
||||
# straightforward.
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import wx
|
||||
import clroses
|
||||
import wx.lib.colourselect as cs
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
from __future__ import print_function
|
||||
|
||||
import wx
|
||||
|
||||
print(wx.version())
|
||||
|
||||
Reference in New Issue
Block a user