mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2025-12-15 17:20:07 +01:00
finish removing six
This commit is contained in:
committed by
Scott Talbert
parent
323e78c085
commit
66a9320917
@@ -133,8 +133,6 @@ Version 0.1
|
||||
import wx
|
||||
import sys
|
||||
|
||||
import six
|
||||
|
||||
from wx.lib.embeddedimage import PyEmbeddedImage
|
||||
|
||||
zoombackgrey = PyEmbeddedImage(
|
||||
@@ -375,7 +373,7 @@ class ZoomBarImage(object):
|
||||
self._oldHeight = 0
|
||||
self._vCenter = 0
|
||||
self._hCenter = 0
|
||||
self._oldInc = -six.MAXSIZE
|
||||
self._oldInc = -sys.MAXSIZE
|
||||
self._isSeparator = False
|
||||
self._enabled = True
|
||||
|
||||
|
||||
@@ -41,12 +41,11 @@ import string
|
||||
import types
|
||||
|
||||
import wx
|
||||
import six
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
MAXSIZE = six.MAXSIZE # (constants should be in upper case)
|
||||
MINSIZE = -six.MAXSIZE-1
|
||||
MAXSIZE = sys.maxsize # (constants should be in upper case)
|
||||
MINSIZE = -sys.MAXSIZE-1
|
||||
LONGTYPE = int
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -80,9 +80,9 @@ will be adjusted accordingly.::
|
||||
bmp = img.ConvertToScaledBitmap(wx.Size(24,24), self)
|
||||
|
||||
"""
|
||||
from itertools import zip_longest
|
||||
|
||||
import wx
|
||||
from six.moves import zip_longest
|
||||
|
||||
from ._nanosvg import *
|
||||
|
||||
|
||||
@@ -33,7 +33,9 @@ Usage: python pywxrc.py -h
|
||||
|
||||
import sys, os, getopt, glob, re
|
||||
import xml.dom.minidom as minidom
|
||||
from six import byte2int
|
||||
|
||||
import operator
|
||||
byte2int = operator.itemgetter(0)
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user