diff --git a/enable/abstract_window.py b/enable/abstract_window.py index 022fcd54a..79e3a0dea 100644 --- a/enable/abstract_window.py +++ b/enable/abstract_window.py @@ -1,5 +1,6 @@ # Major library imports +import six.moves as sm from numpy import dot # Enthought library imports @@ -134,7 +135,7 @@ def _init_gc(self): gc.clear(self.bgcolor_) else: # Fixme: should use clip_to_rects - update_union = reduce(union_bounds, self._update_region) + update_union = sm.reduce(union_bounds, self._update_region) gc.clip_to_rect(*update_union) return @@ -264,7 +265,7 @@ def _handle_key_event(self, event_type, event): if history is not None and len(history) > 0: # Assemble all the transforms transforms = [c.get_event_transform() for c in history] - total_transform = reduce(dot, transforms[::-1]) + total_transform = sm.reduce(dot, transforms[::-1]) key_event.push_transform(total_transform) elif self.mouse_owner_transform is not None: key_event.push_transform(self.mouse_owner_transform) @@ -313,7 +314,7 @@ def _handle_mouse_event(self, event_name, event, set_focus=False): if history is not None and len(history) > 0: # Assemble all the transforms transforms = [c.get_event_transform() for c in history] - total_transform = reduce(dot, transforms[::-1]) + total_transform = sm.reduce(dot, transforms[::-1]) mouse_event.push_transform(total_transform) elif self.mouse_owner_transform is not None: mouse_event.push_transform(self.mouse_owner_transform) diff --git a/enable/base.py b/enable/base.py index 796d1ee46..8b561add2 100644 --- a/enable/base.py +++ b/enable/base.py @@ -24,6 +24,7 @@ from __future__ import generators # Major library imports +import six.moves as sm # Enthought library imports from traits.api import TraitError @@ -82,11 +83,11 @@ def str_to_font ( object, name, value ): face_name = [] for word in value.split(): lword = word.lower() - if font_families.has_key( lword ): + if lword in font_families: family = font_families[ lword ] - elif font_styles.has_key( lword ): + elif lword in font_styles: style = font_styles[ lword ] - elif font_weights.has_key( lword ): + elif lword in font_weights: weight = font_weights[ lword ] elif lword == 'underline': underline = 1 @@ -103,7 +104,7 @@ def str_to_font ( object, name, value ): underline = underline) except: pass - raise TraitError, ( object, name, 'a font descriptor string', + raise TraitError(object, name, 'a font descriptor string', repr( value ) ) str_to_font.info = ( "a string describing a font (e.g. '12 pt bold italic " + @@ -239,7 +240,7 @@ def send_event_to ( components, event_name, event ): setattr( component, pre_event_name, event ) if event.handled: return len( components ) - for i in xrange( len( components ) - 1, -1, -1 ): + for i in sm.range( len( components ) - 1, -1, -1 ): setattr( components[i], event_name, event ) if event.handled: return i diff --git a/enable/canvas.py b/enable/canvas.py index e1a1d2928..c1e5475f4 100644 --- a/enable/canvas.py +++ b/enable/canvas.py @@ -81,7 +81,7 @@ def remove(self, *components): component.container = None self._components.remove(component) else: - raise RuntimeError, "Unable to remove component from container." + raise RuntimeError("Unable to remove component from container.") # Check to see if we need to compact. x, y, x2, y2 = self._bounding_box diff --git a/enable/component.py b/enable/component.py index 2aadd0e85..6f86a6396 100644 --- a/enable/component.py +++ b/enable/component.py @@ -376,21 +376,24 @@ def __init__(self, **traits): # may override the bulk default. padding = traits.pop('padding', None) padding_traits = {} - for name in traits.keys(): - # Use .keys() so we can modify the dict during iteration safely. - if name in ['padding_top', 'padding_bottom', 'padding_left', - 'padding_right']: + for name in ['padding_top', + 'padding_bottom', + 'padding_left', + 'padding_right']: + try: padding_traits[name] = traits.pop(name) + except KeyError: + pass - if traits.has_key("container"): + if "container" in traits: # After the component is otherwise configured, make sure our # container gets notified of our being added to it. container = traits.pop("container") - super(Component,self).__init__(**traits) + super(Component, self).__init__(**traits) self._set_padding_traits(padding, padding_traits) container.add(self) else: - super(Component,self).__init__(**traits) + super(Component, self).__init__(**traits) self._set_padding_traits(padding, padding_traits) return diff --git a/enable/constraints_container.py b/enable/constraints_container.py index 309215a3e..6d2fdb819 100644 --- a/enable/constraints_container.py +++ b/enable/constraints_container.py @@ -4,6 +4,8 @@ #------------------------------------------------------------------------------ from collections import deque +import six + # traits imports from traits.api import Any, Bool, Callable, Dict, Either, Instance, List, \ Property @@ -243,7 +245,7 @@ def __components_changed(self, new): """ Make sure components that are added can be used with constraints. """ # Clear the component maps - for key, item in self._component_map.iteritems(): + for key, item in six.iteritems(self._component_map): item.on_trait_change(self._component_size_hint_changed, 'layout_size_hint', remove=True) self._component_map = {} @@ -293,7 +295,7 @@ def _build_layout_table(self): zero_offset = (0, 0) offset_table = [zero_offset] layout_table = [] - queue = deque((0, child) for child in self._component_map.itervalues()) + queue = deque((0, child) for child in six.itervalues(self._component_map)) # Micro-optimization: pre-fetch bound methods and store globals # as locals. This method is not on the code path of a resize @@ -321,7 +323,7 @@ def _build_layout_table(self): running_index += 1 if isinst(item, Container_): if item.transfer_layout_ownership(self): - for child in item._component_map.itervalues(): + for child in six.itervalues(item._component_map): push((running_index, child)) return offset_table, layout_table diff --git a/enable/container.py b/enable/container.py index c8d1a34f7..99bc41a88 100644 --- a/enable/container.py +++ b/enable/container.py @@ -101,7 +101,7 @@ def __init__(self, *components, **traits): Component.__init__(self, **traits) for component in components: self.add(component) - if "bounds" in traits.keys() and "auto_size" not in traits.keys(): + if "bounds" in traits and "auto_size" not in traits: self.auto_size = False if 'intercept_events' in traits: @@ -130,7 +130,7 @@ def remove(self, *components): component.container = None self._components.remove(component) else: - raise RuntimeError, "Unable to remove component from container." + raise RuntimeError("Unable to remove component from container.") # Check to see if we need to compact. if self.auto_size: diff --git a/enable/coordinate_box.py b/enable/coordinate_box.py index ab1b521fb..d25a52807 100644 --- a/enable/coordinate_box.py +++ b/enable/coordinate_box.py @@ -1,4 +1,6 @@ +import six + # Enthought library imports from traits.api import HasTraits, Enum, Instance, Property, Tuple @@ -162,7 +164,7 @@ def _get_width(self): def _set_width(self, val): - if isinstance(val, basestring): + if isinstance(val, six.string_types): try: val = float(val) except: @@ -177,7 +179,7 @@ def _get_height(self): return self.bounds[1] def _set_height(self, val): - if isinstance(val, basestring): + if isinstance(val, six.string_types): try: val = float(val) except: diff --git a/enable/enable_traits.py b/enable/enable_traits.py index 75625a449..afa85ae0a 100644 --- a/enable/enable_traits.py +++ b/enable/enable_traits.py @@ -75,7 +75,7 @@ 'dot': array( [ 2.0, 2.0 ] ), 'long dash': array( [ 9.0, 5.0 ] ) } -__line_style_trait_map_keys = __line_style_trait_values.keys() +__line_style_trait_map_keys = list(__line_style_trait_values.keys()) LineStyleEditor = EnumEditor( values=__line_style_trait_map_keys) def __line_style_trait( value='solid', **metadata ): diff --git a/enable/events.py b/enable/events.py index b7ec85791..922215e77 100644 --- a/enable/events.py +++ b/enable/events.py @@ -3,6 +3,7 @@ For a list of all the possible event suffixes, see interactor.py. """ +import six.moves as sm # Major library imports from numpy import array, dot @@ -103,7 +104,7 @@ def net_transform(self): if len(self._transform_stack) == 0: return affine.affine_identity() else: - return reduce(dot, self._transform_stack[::-1]) + return sm.reduce(dot, self._transform_stack[::-1]) def current_pointer_position(self): """ diff --git a/enable/example_support.py b/enable/example_support.py index 3f8a2e073..959b2f7f2 100644 --- a/enable/example_support.py +++ b/enable/example_support.py @@ -14,7 +14,7 @@ if not ETSConfig.toolkit: for toolkit, toolkit_module in (('wx', 'wx'), ('qt4', 'PyQt4')): try: - exec "import " + toolkit_module + exec("import " + toolkit_module) ETSConfig.toolkit = toolkit break except ImportError: diff --git a/enable/gadgets/vu_meter.py b/enable/gadgets/vu_meter.py index 82a53c6f6..cc8ac5b80 100644 --- a/enable/gadgets/vu_meter.py +++ b/enable/gadgets/vu_meter.py @@ -1,6 +1,8 @@ import math +import six.moves as sm + from traits.api import Float, Property, List, Str, Range from enable.api import Component from kiva.trait_defs.kiva_font_trait import KivaFont @@ -37,7 +39,7 @@ class VUMeter(Component): # Values of the percentage-based ticks; these are drawn and labeled along # the bottom of the curve axis. - percent_ticks = List(range(0, 101, 20)) + percent_ticks = List(list(sm.range(0, 101, 20))) # Text to write in the middle of the VU Meter. text = Str("VU") diff --git a/enable/graphics_context.py b/enable/graphics_context.py index deed6c0a4..ff062d9e5 100644 --- a/enable/graphics_context.py +++ b/enable/graphics_context.py @@ -27,7 +27,7 @@ class EnableGCMixin(object): window = None #Instance(AbstractWindow) def __init__(self, *args, **kwargs): - if kwargs.has_key("window"): + if "window" in kwargs: self.window = kwargs.pop("window") super(EnableGCMixin, self).__init__(*args, **kwargs) return @@ -59,8 +59,8 @@ def clear_clip_region(self, color, update_region): return def alpha(self, alpha): - raise NotImplementedError, \ - "The alpha() method is not compatible with DisplayPDF; use clear() instead." + raise NotImplementedError( + "The alpha() method is not compatible with DisplayPDF; use clear() instead.") def stretch_draw(self, image, x, y, dx, dy): "Draws an image 'stretched' to fit a specified area" diff --git a/enable/layout/ab_constrainable.py b/enable/layout/ab_constrainable.py index cea36d892..02fdbee03 100644 --- a/enable/layout/ab_constrainable.py +++ b/enable/layout/ab_constrainable.py @@ -4,7 +4,10 @@ #------------------------------------------------------------------------------ from abc import ABCMeta +import six + +@six.add_metaclass(ABCMeta) class ABConstrainable(object): """ An abstract base class for objects that can be laid out using layout helpers. @@ -14,5 +17,3 @@ class ABConstrainable(object): which are `LinearSymbolic` instances. """ - __metaclass__ = ABCMeta - diff --git a/enable/layout/layout_helpers.py b/enable/layout/layout_helpers.py index eed5f0880..7a90d6f87 100644 --- a/enable/layout/layout_helpers.py +++ b/enable/layout/layout_helpers.py @@ -6,6 +6,9 @@ from collections import defaultdict from uuid import uuid4 +import six +import six.moves as sm + from kiwisolver import Variable, Constraint from traits.api import HasTraits, Instance, Range @@ -84,12 +87,12 @@ def is_spacer(item): #------------------------------------------------------------------------------ # Deferred Constraints #------------------------------------------------------------------------------ +@six.add_metaclass(ABCMeta) class DeferredConstraints(object): """ Abstract base class for objects that will yield lists of constraints upon request. """ - __metaclass__ = ABCMeta def __init__(self): """ Initialize a DeferredConstraints instance. @@ -104,9 +107,9 @@ def __or__(self, other): strength. """ - if isinstance(other, (float, int, long)): + if isinstance(other, (float, six.integer_types)): self.default_string = float(other) - elif isinstance(other, basestring): + elif isinstance(other, six.string_types): if other not in STRENGTHS: raise ValueError('Invalid strength %r' % other) self.default_strength = other @@ -653,12 +656,12 @@ def _get_constraints(self, component): row_vars = [] col_vars = [] cn_id = self.constraints_id - for idx in xrange(num_rows + 1): + for idx in sm.range(num_rows + 1): name = 'row' + str(idx) var = Variable('{0}|{1}'.format(cn_id, name)) row_vars.append(var) constraints.append(var >= 0) - for idx in xrange(num_cols + 1): + for idx in sm.range(num_cols + 1): name = 'col' + str(idx) var = Variable('{0}|{1}'.format(cn_id, name)) col_vars.append(var) @@ -719,7 +722,7 @@ def _get_constraints(self, component): for cell in cells: if cell.start_row == cell.end_row: row_map[cell.start_row].append(cell.item) - for items in row_map.itervalues(): + for items in six.itervalues(row_map): if len(items) > 1: helpers.append(AlignmentHelper(self.row_align, *items)) @@ -731,7 +734,7 @@ def _get_constraints(self, component): for cell in cells: if cell.start_col == cell.end_col: col_map[cell.start_col].append(cell.item) - for items in row_map.itervalues(): + for items in six.itervalues(row_map): if len(items) > 1: helpers.append(AlignmentHelper(self.col_align, *items)) @@ -745,14 +748,13 @@ def _get_constraints(self, component): #------------------------------------------------------------------------------ # Abstract Constraint Factory #------------------------------------------------------------------------------ +@six.add_metaclass(ABCMeta) class AbstractConstraintFactory(object): """ An abstract constraint factory class. Subclasses must implement the 'constraints' method implement which returns a LinearConstraint instance. """ - __metaclass__ = ABCMeta - @staticmethod def validate(items): """ A validator staticmethod that insures a sequence of items is @@ -1072,12 +1074,12 @@ def from_items(cls, items, anchor_name, spacing): #------------------------------------------------------------------------------ # Spacers #------------------------------------------------------------------------------ +@six.add_metaclass(ABCMeta) class Spacer(object): """ An abstract base class for spacers. Subclasses must implement the 'constrain' method. """ - __metaclass__ = ABCMeta def __init__(self, amt, strength=None): self.amt = max(0, amt) diff --git a/enable/layout/linear_symbolic.py b/enable/layout/linear_symbolic.py index 490cf8602..51dc8aa76 100644 --- a/enable/layout/linear_symbolic.py +++ b/enable/layout/linear_symbolic.py @@ -1,17 +1,19 @@ -#------------------------------------------------------------------------------ +# ------------------------------------------------------------------------------ # Copyright (c) 2014, Enthought, Inc. # All rights reserved. -#------------------------------------------------------------------------------ +# ------------------------------------------------------------------------------ from abc import ABCMeta +import six + import kiwisolver as kiwi +@six.add_metaclass(ABCMeta) class LinearSymbolic(object): """ An abstract base class for testing linear symbolic interfaces. """ - __metaclass__ = ABCMeta LinearSymbolic.register(kiwi.Variable) diff --git a/enable/native_scrollbar.py b/enable/native_scrollbar.py index 459c24bdc..96d5959ba 100644 --- a/enable/native_scrollbar.py +++ b/enable/native_scrollbar.py @@ -14,7 +14,7 @@ # Import the toolkit specific version. -from toolkit import toolkit_object +from .toolkit import toolkit_object NativeScrollBar = toolkit_object('NativeScrollBar') #### EOF ###################################################################### diff --git a/enable/primitives/shape.py b/enable/primitives/shape.py index 0deb8c0fe..503b15a14 100644 --- a/enable/primitives/shape.py +++ b/enable/primitives/shape.py @@ -2,6 +2,8 @@ # Standard library imports. +from __future__ import print_function + import math # Enthought library imports. @@ -55,7 +57,7 @@ class Shape(Component): def normal_key_pressed(self, event): """ Event handler. """ - print 'normal_key_pressed', event.character + print('normal_key_pressed', event.character) return @@ -148,9 +150,10 @@ def _text_default(self): # Protected 'Shape' interface ########################################################################### - def _distance_between(self, (x1, y1), (x2, y2)): + def _distance_between(self, point_1, point_2): """ Return the distance between two points. """ - + (x1, y1) = point_1 + (x2, y2) = point_2 return math.sqrt(pow(x1 - x2, 2) + pow(y1 - y2, 2)) def _draw_text(self, gc): diff --git a/enable/qt4/base_window.py b/enable/qt4/base_window.py index 67b499852..d5d57315b 100644 --- a/enable/qt4/base_window.py +++ b/enable/qt4/base_window.py @@ -14,6 +14,7 @@ # been on my list of things to do. #------------------------------------------------------------------------------ +import six # Qt imports. from pyface.qt import QtCore, QtGui, QtOpenGL @@ -24,7 +25,7 @@ from traits.api import Instance # Local imports. -from constants import ( +from .constants import ( BUTTON_NAME_MAP, KEY_MAP, MOUSE_WHEEL_AXIS_MAP, POINTER_MAP, DRAG_RESULTS_MAP ) @@ -359,14 +360,14 @@ def _create_key_event(self, event_type, event): return None if event_type == 'character': - key = unicode(event.text()) + key = six.text_type(event.text()) else: # Convert the keypress to a standard enable key if possible, otherwise # to text. key_code = event.key() key = KEY_MAP.get(key_code) if key is None: - key = unichr(key_code).lower() + key = six.unichr(key_code).lower() if not key: return None diff --git a/enable/qt4/constants.py b/enable/qt4/constants.py index 7ad91a89f..d3b2d799c 100644 --- a/enable/qt4/constants.py +++ b/enable/qt4/constants.py @@ -13,6 +13,8 @@ import warnings +import six.moves as sm + from pyface.qt import QtCore from ..toolkit_constants import key_names, mouse_wheel_axes_names, pointer_names @@ -79,7 +81,7 @@ if len(pointer_names) != len(pointer_shapes): warnings.warn("The Qt4 toolkit backend pointer map is out of sync!") -POINTER_MAP = dict(zip(pointer_names, pointer_shapes)) +POINTER_MAP = dict(sm.zip(pointer_names, pointer_shapes)) KEY_MAP = { QtCore.Qt.Key_Backspace: 'Backspace', diff --git a/enable/qt4/scrollbar.py b/enable/qt4/scrollbar.py index 41f914d63..1d624313e 100644 --- a/enable/qt4/scrollbar.py +++ b/enable/qt4/scrollbar.py @@ -3,6 +3,8 @@ the standard Qt one. """ +import six.moves as sm + from pyface.qt import QtCore, QtGui from traits.api import Any, Bool, Enum, Float, Int, Property, Trait, TraitError @@ -126,7 +128,7 @@ def _get_abs_coords(self, x, y): def _draw_mainlayer(self, gc, view_bounds=None, mode="default"): x_pos, y_pos = self.position - x_size, y_size = map(int, self.bounds) + x_size, y_size = sm.map(int, self.bounds) qt_xpos, qt_ypos = self._get_abs_coords(x_pos, y_pos+y_size-1) diff --git a/enable/render_controllers.py b/enable/render_controllers.py index 503fb6730..d7816b064 100644 --- a/enable/render_controllers.py +++ b/enable/render_controllers.py @@ -67,7 +67,7 @@ def draw(self, component, gc, view_bounds=None, mode="normal"): component._backbuffer = None component.invalidate_draw() if not self.draw_valid: - from kiva_graphics_context import GraphicsContext + from .kiva_graphics_context import GraphicsContext bb = GraphicsContext(tuple(map(int, component.bounds))) bb.translate_ctm(-component.x, -component.y) self._do_draw(component, bb, view_bounds=None, mode=mode) diff --git a/enable/savage/compliance/comparator.py b/enable/savage/compliance/comparator.py index a61d55ba5..e0bcef73c 100644 --- a/enable/savage/compliance/comparator.py +++ b/enable/savage/compliance/comparator.py @@ -26,11 +26,11 @@ from enable.savage.svg.backends.wx.renderer import Renderer as WxRenderer from enable.savage.svg.backends.kiva.renderer import Renderer as KivaRenderer -from crosshair import Crosshair, MultiController -from profile_this import ProfileThis -from sike import Sike -from svg_component import ImageComponent, SVGComponent -from xml_view import xml_to_tree, xml_tree_editor +from .crosshair import Crosshair, MultiController +from .profile_this import ProfileThis +from .sike import Sike +from .svg_component import ImageComponent, SVGComponent +from .xml_view import xml_to_tree, xml_tree_editor logger = logging.getLogger() @@ -320,7 +320,7 @@ def _current_file_changed(self, new): self.kiva_component.document = document.SVGDocument(self.current_xml, resources=resources, renderer=KivaRenderer) - except Exception, e: + except Exception as e: logger.exception('Error parsing document %s', new) self.kiva_component.document diff --git a/enable/savage/compliance/drawer.py b/enable/savage/compliance/drawer.py index c9ce6caf1..b2bcf5ebd 100644 --- a/enable/savage/compliance/drawer.py +++ b/enable/savage/compliance/drawer.py @@ -1,4 +1,7 @@ import svg +import six +import six.moves as sm + import wx import wx.py.shell import wx.aui @@ -43,7 +46,7 @@ def OnPaint(self, evt): class DrawFrame(wx.Frame): def __init__(self, parent, *args, **kwargs): wx.Frame.__init__(self, parent, *args, **kwargs) - self.pathOps = dict((k,v) for (k,v) in wx.GraphicsPath.__dict__.iteritems() if k.startswith("Add")) + self.pathOps = {k: v for (k,v) in six.iteritems(wx.GraphicsPath.__dict__) if k.startswith("Add")} self.pathOps["CloseSubpath"] = wx.GraphicsPath.CloseSubpath self.pathOps["MoveToPoint"] = wx.GraphicsPath.MoveToPoint self.pathOps[""] = None @@ -95,14 +98,14 @@ def OnPathChange(self, evt): self.panel.SetPath(path) def FillPath(self, path): - for row in xrange(100): + for row in sm.range(100): #~ print row, operation = self.grid.GetCellValue(row, 0) if not operation: return #~ print operation, args = [] - for col in xrange(1,20): + for col in sm.range(1,20): v = self.grid.GetCellValue(row, col) if not v: break diff --git a/enable/savage/compliance/sike.py b/enable/savage/compliance/sike.py index 76b09e525..adde9df22 100644 --- a/enable/savage/compliance/sike.py +++ b/enable/savage/compliance/sike.py @@ -5,6 +5,8 @@ import os import pstats +import six + from traits.api import (Any, Bool, Constant, Dict, Event, Float, HasTraits, Instance, Int, List, Property, Str, on_trait_change) from traitsui import api as tui @@ -204,7 +206,7 @@ def __init__(self, obj=None): self.stats = {} elif isinstance(obj, dict): self.stats = obj - elif isinstance(obj, basestring): + elif isinstance(obj, six.string_types): # Load from a file. self.stats = pstats.Stats(obj) elif hasattr(obj, 'stats'): diff --git a/enable/savage/compliance/viewer.py b/enable/savage/compliance/viewer.py index 1152996af..95b540249 100644 --- a/enable/savage/compliance/viewer.py +++ b/enable/savage/compliance/viewer.py @@ -1,8 +1,12 @@ +from __future__ import print_function + import os import time from six import StringIO import xml.etree.cElementTree as etree +import six.moves as sm + import wx import wx.aui import enable.savage.svg.document as document @@ -171,7 +175,7 @@ def makeToolBar(self): def getFileList(self): #look for the test files in the w3c dir files = os.listdir(self.getSVGDir()) - splitted = map(os.path.splitext, files) + splitted = sm.map(os.path.splitext, files) return sorted(fname for fname, ext in splitted) @@ -244,7 +248,7 @@ def OnTreeSelectionChange(self, evt): if element is None: return path = self.document.paths[element] - print path + print(path) def OnUpdateUI(self, evt): if self.render.lastRender is not None: diff --git a/enable/savage/svg/attributes.py b/enable/savage/svg/attributes.py index e58871451..03de90a81 100644 --- a/enable/savage/svg/attributes.py +++ b/enable/savage/svg/attributes.py @@ -6,7 +6,7 @@ Optional, oneOf, Group, StringEnd, Combine, Word, alphas, hexnums, CaselessLiteral, SkipTo ) -from css.colour import colourValue +from .css.colour import colourValue import string ##Paint values diff --git a/enable/savage/svg/backends/kiva/renderer.py b/enable/savage/svg/backends/kiva/renderer.py index 0ff51af18..f87d190f8 100644 --- a/enable/savage/svg/backends/kiva/renderer.py +++ b/enable/savage/svg/backends/kiva/renderer.py @@ -1,7 +1,11 @@ +from __future__ import print_function + from math import sqrt, pi import sys import warnings +import six + import numpy as np from enable.compiled_path import CompiledPath as KivaCompiledPath @@ -292,8 +296,8 @@ def font_style(font): elif font.style in [0, 'regular','normal']: style = 'regular' else: - print "Font style '%s' and weight: '%s' not known." \ - " Using style='regular'" % (font.style, font.weight) + print("Font style '%s' and weight: '%s' not known." + " Using style='regular'" % (font.style, font.weight)) style = 'regular' return style @@ -402,7 +406,7 @@ def setFontSize(cls, font, size): @classmethod def setFontStyle(cls, font, style): - if isinstance(style, basestring): + if isinstance(style, six.string_types): if style not in fonttools.font.font_styles: warnings.warn('font style "%s" not supported' % style) else: @@ -412,7 +416,7 @@ def setFontStyle(cls, font, style): @classmethod def setFontWeight(cls, font, weight): - if isinstance(weight, basestring): + if isinstance(weight, six.string_types): if weight not in fonttools.font.font_weights: warnings.warn('font weight "%s" not supported' % weight) else: diff --git a/enable/savage/svg/css/__init__.py b/enable/savage/svg/css/__init__.py index 2e9d5b9d0..3e5cb14c5 100644 --- a/enable/savage/svg/css/__init__.py +++ b/enable/savage/svg/css/__init__.py @@ -1,2 +1,2 @@ -from transform import transformList -from inline import inlineStyle +from .transform import transformList +from .inline import inlineStyle diff --git a/enable/savage/svg/css/atrule.py b/enable/savage/svg/css/atrule.py index cfa93723d..7a0face63 100644 --- a/enable/savage/svg/css/atrule.py +++ b/enable/savage/svg/css/atrule.py @@ -1,6 +1,6 @@ """ CSS at-rules""" from pyparsing import Literal, Combine -from identifier import identifier +from .identifier import identifier atkeyword = Combine(Literal("@") + identifier) diff --git a/enable/savage/svg/css/identifier.py b/enable/savage/svg/css/identifier.py index 64472eefd..c258f2b49 100644 --- a/enable/savage/svg/css/identifier.py +++ b/enable/savage/svg/css/identifier.py @@ -1,4 +1,5 @@ """ Parse CSS identifiers. More complicated than it sounds""" +import six from pyparsing import Word, Literal, Regex, Combine, Optional, White, oneOf, ZeroOrMore import string @@ -16,7 +17,7 @@ def __init__(self, ws=" \t\r\n\f", min=1, max=0, exact=0): ) def convertToUnicode(t): - return unichr(int(t[0], 16)) + return six.unichr(int(t[0], 16)) hex_unicode = ( Literal("\\").suppress() + Regex("[0-9a-f]{1,6}", re.IGNORECASE) + diff --git a/enable/savage/svg/document.py b/enable/savage/svg/document.py index 88a0fc941..f28d85c5e 100644 --- a/enable/savage/svg/document.py +++ b/enable/savage/svg/document.py @@ -1,12 +1,17 @@ """ SVGDocument """ +from __future__ import print_function + from io import BytesIO import warnings import math from functools import wraps import os -import urllib + +import six +import six.moves as sm + import six.moves.urllib.parse as urlparse from xml.etree import cElementTree as ET try: @@ -18,11 +23,11 @@ import numpy -import css -from css.colour import colourValue -from css import values -from attributes import paintValue -from svg_regex import svg_parser +from . import css +from .css.colour import colourValue +from .css import values +from .attributes import paintValue +from .svg_regex import svg_parser from enable.savage.svg.backends.null.null_renderer import NullRenderer, AbstractGradientBrush @@ -112,7 +117,7 @@ def valueToPixels(val, defaultUnits="px"): val, unit = values.length.parseString(val) except ParseException: import pdb;pdb.set_trace() - print 'valueToPixels(%r, %r)' % (val, defaultUnits) + print('valueToPixels(%r, %r)' % (val, defaultUnits)) raise val *= units_to_px.get(unit, 1) return val @@ -183,7 +188,7 @@ def resolve(self, path): # Plain URI. Pass it back. # Read the data and stuff it in a StringIO in order to satisfy # functions that need a functioning seek() and stuff. - return path, lambda uri: BytesIO(urllib.urlopen(uri).read()) + return path, lambda uri: BytesIO(sm.urllib.request.urlopen(uri).read()) path = os.path.abspath(os.path.join(self.dirname, path_part)) return path, lambda fn: open(fn, 'rb') @@ -502,7 +507,7 @@ def addUseToDocument(self, node): resources = self.resources try: element = self.dereference(href, resources) - except (OSError, IOError), e: + except (OSError, IOError) as e: # SVG file cannot be found. warnings.warn("Could not find SVG file %s. %s: %s" % (href, e.__class__.__name__, e)) return None, [] @@ -556,7 +561,7 @@ def addImageToDocument(self, node): return self.addUseToDocument(node) try: image = resources.open_image(uri) - except (OSError, IOError), e: + except (OSError, IOError) as e: # Image cannot be found. warnings.warn("Could not find image file %s. %s: %s" % (uri[:100], e.__class__.__name__, str(e)[:100])) return None, [] @@ -652,7 +657,7 @@ def addRectToDocument(self, node, path): ops = [] - if 'clip-path' in node.keys(): + if 'clip-path' in node: element = self.dereference(node.get('clip-path')) ops = [ @@ -756,18 +761,18 @@ def normalizeStrokes(parseResults): else: arguments = iter(arguments) if command == 'm': - yield (command, arguments.next()) + yield (command, six.next(arguments)) command = "l" elif command == "M": - yield (command, arguments.next()) + yield (command, six.next(arguments)) command = "L" for arg in arguments: yield (command, arg) try: parsed = svg_parser.parse(data) - except SyntaxError, e: - print 'SyntaxError: %s' % e - print 'data = %r' % data + except SyntaxError as e: + print('SyntaxError: %s' % e) + print('data = %r' % data) else: for stroke in normalizeStrokes(parsed): self.addStrokeToPath(path, stroke) @@ -821,8 +826,8 @@ def getPenFromState(self): pen.SetWidth(width) stroke_dasharray = self.state.get('stroke-dasharray', 'none') if stroke_dasharray != 'none': - stroke_dasharray = map(valueToPixels, - stroke_dasharray.replace(',', ' ').split()) + stroke_dasharray = list(sm.map(valueToPixels, + stroke_dasharray.replace(',', ' ').split())) if len(stroke_dasharray) % 2: # Repeat to get an even array. stroke_dasharray = stroke_dasharray * 2 @@ -1003,7 +1008,7 @@ def reflectPoint(point, relativeTo): path.AddLineToPoint(*pt) elif type == 'C': #control1, control2, endpoint = arg - control1, control2, endpoint = map( + control1, control2, endpoint = sm.map( normalizePoint, arg ) self.lastControl = control2 @@ -1021,7 +1026,7 @@ def reflectPoint(point, relativeTo): elif type == 'S': #control2, endpoint = arg - control2, endpoint = map( + control2, endpoint = sm.map( normalizePoint, arg ) if self.lastControl: @@ -1036,7 +1041,7 @@ def reflectPoint(point, relativeTo): endpoint ) elif type == "Q": - (cx, cy), (x,y) = map(normalizePoint, arg) + (cx, cy), (x,y) = sm.map(normalizePoint, arg) self.lastControlQ = (cx, cy) path.AddQuadCurveToPoint(cx, cy, x, y) elif type == "T": diff --git a/enable/savage/svg/svg_regex.py b/enable/savage/svg/svg_regex.py index 8f45b9998..abd064a33 100644 --- a/enable/savage/svg/svg_regex.py +++ b/enable/savage/svg/svg_regex.py @@ -14,6 +14,9 @@ """ import re +from functools import partial + +import six # Sentinel. @@ -114,9 +117,9 @@ def __init__(self, lexer=svg_lexer): def parse(self, text): """ Parse a string of SVG data. """ - next = self.lexer.lex(text).next - token = next() - return self.rule_svg_path(next, token) + svg_iterator = self.lexer.lex(text) + token = six.next(svg_iterator) + return self.rule_svg_path(partial(six.next, svg_iterator), token) def rule_svg_path(self, next, token): commands = [] diff --git a/enable/savage/svg/tests/css/test_identifier.py b/enable/savage/svg/tests/css/test_identifier.py index b56d21457..b59e18115 100644 --- a/enable/savage/svg/tests/css/test_identifier.py +++ b/enable/savage/svg/tests/css/test_identifier.py @@ -1,6 +1,10 @@ import unittest import string import sys + +import six +import six.moves as sm + from pyparsing import ParseException, Regex, StringEnd import enable.savage.svg.css.identifier as identifier @@ -58,20 +62,20 @@ def testDoesntConsumeMoreThanOneSpace(self): class TestEscape(unittest.TestCase): def testEscapeValues(self): self.assertEqual(u"&", identifier.escape.parseString(r"\26")[0]) - self.assertEqual(u'\x81', identifier.escape.parseString("\\" + unichr(129))[0]) + self.assertEqual(u'\x81', identifier.escape.parseString("\\" + six.unichr(129))[0]) self.assertEqual(u"~", identifier.escape.parseString(r'\~')[0]) class TestNonAscii(unittest.TestCase): def testNoMatchInAsciiRange(self): - for c in map(unichr, range(128)): + for c in sm.map(six.unichr, sm.range(128)): self.assertRaises( ParseException, identifier.nonascii.parseString, c ) def testMatchesOutsideAsciiRange(self): - for c in map(unichr, xrange(128, sys.maxunicode+1)): + for c in sm.map(six.unichr, sm.range(128, sys.maxunicode+1)): self.assertEqual( c, identifier.nonascii.parseString(c)[0] diff --git a/enable/savage/svg/tests/test_attributes.py b/enable/savage/svg/tests/test_attributes.py index 7fd83e2ca..fb4360a2a 100644 --- a/enable/savage/svg/tests/test_attributes.py +++ b/enable/savage/svg/tests/test_attributes.py @@ -1,7 +1,7 @@ import unittest import enable.savage.svg.attributes as a -from css.test_color import TestValueParser +from .css.test_color import TestValueParser class TestURLParser(unittest.TestCase): diff --git a/enable/savage/trait_defs/ui/api.py b/enable/savage/trait_defs/ui/api.py index 053dd2fa3..847867326 100644 --- a/enable/savage/trait_defs/ui/api.py +++ b/enable/savage/trait_defs/ui/api.py @@ -22,4 +22,4 @@ # Imports: #------------------------------------------------------------------------------- -from svg_editor import SVGEditor +from .svg_editor import SVGEditor diff --git a/enable/savage/trait_defs/ui/svg_button.py b/enable/savage/trait_defs/ui/svg_button.py index 60442eeda..35fa0f121 100644 --- a/enable/savage/trait_defs/ui/svg_button.py +++ b/enable/savage/trait_defs/ui/svg_button.py @@ -16,7 +16,7 @@ from traits.api import Event # Local imports -from svg_button_editor import SVGButtonEditor +from .svg_button_editor import SVGButtonEditor class SVGButton ( Event ): diff --git a/enable/savage/trait_defs/ui/svg_button_editor.py b/enable/savage/trait_defs/ui/svg_button_editor.py index 9fc2f2d12..421ae41af 100644 --- a/enable/savage/trait_defs/ui/svg_button_editor.py +++ b/enable/savage/trait_defs/ui/svg_button_editor.py @@ -19,6 +19,8 @@ # Imports: #------------------------------------------------------------------------------- +import six + from enable.savage.trait_defs.ui.toolkit import toolkit_object from traits.api import Bool, Enum, Int, Property, Range, Str, Any @@ -99,7 +101,7 @@ def _get_value ( self ): def _set_value ( self, value ): self._value = value - if isinstance(value, basestring): + if isinstance(value, six.string_types): try: self._value = int( value ) except: diff --git a/enable/savage/trait_defs/ui/toolkit.py b/enable/savage/trait_defs/ui/toolkit.py index 5c4bfdab2..824cbcbfe 100644 --- a/enable/savage/trait_defs/ui/toolkit.py +++ b/enable/savage/trait_defs/ui/toolkit.py @@ -31,9 +31,9 @@ def _init_toolkit(): backend = 'enable.savage.trait_defs.ui.%s' % ETSConfig.toolkit try: __import__(backend) - except ImportError, SystemExit: - raise ImportError, "Unable to import a Savage backend for the %s " \ - "toolkit." % ETSConfig.toolkit + except (ImportError, SystemExit): + raise ImportError("Unable to import a Savage backend for the %s " + "toolkit." % ETSConfig.toolkit) # Save the imported toolkit module. global _toolkit_backend @@ -67,9 +67,9 @@ def __init__(self, *args, **kwargs): __import__(be_mname) try: be_obj = getattr(sys.modules[be_mname], oname) - except AttributeError, e: + except AttributeError as e: if raise_exceptions: raise e - except ImportError, e: + except ImportError as e: if raise_exceptions: raise e return be_obj diff --git a/enable/savage/trait_defs/ui/wx/svg_button_editor.py b/enable/savage/trait_defs/ui/wx/svg_button_editor.py index 17f75de6a..9b0e07964 100644 --- a/enable/savage/trait_defs/ui/wx/svg_button_editor.py +++ b/enable/savage/trait_defs/ui/wx/svg_button_editor.py @@ -32,7 +32,7 @@ from traitsui.wx.editor import Editor # Local imports -from wx_render_panel import RenderPanel +from .wx_render_panel import RenderPanel class ButtonRenderPanel(RenderPanel): diff --git a/enable/savage/trait_defs/ui/wx/svg_editor.py b/enable/savage/trait_defs/ui/wx/svg_editor.py index 15ba03ff4..d976b1923 100644 --- a/enable/savage/trait_defs/ui/wx/svg_editor.py +++ b/enable/savage/trait_defs/ui/wx/svg_editor.py @@ -27,8 +27,8 @@ from enable.savage.svg.backends.wx.renderer import Renderer as WxRenderer from enable.savage.svg.backends.kiva.renderer import Renderer as KivaRenderer -from kiva_render_panel import RenderPanel as KivaRenderPanel -from wx_render_panel import RenderPanel as WxRenderPanel +from .kiva_render_panel import RenderPanel as KivaRenderPanel +from .wx_render_panel import RenderPanel as WxRenderPanel #------------------------------------------------------------------------------- # 'SVGEditor' class: diff --git a/enable/scrollbar.py b/enable/scrollbar.py index 01d913da0..54e66725e 100644 --- a/enable/scrollbar.py +++ b/enable/scrollbar.py @@ -7,6 +7,7 @@ from __future__ import with_statement +import six.moves as sm # PZW: Define a scrollbar that uses the system/wx-native scrollbar instead # of drawing our own. @@ -166,13 +167,13 @@ def _init_images(self): sb_image[ 'vtrack' ] = self.image_for('=sb_vtrack') sb_image[ 'htrack' ] = self.image_for('=sb_htrack') v_width = sb_image[ 'vtrack' ].width() - vs_height = reduce(lambda a, b: a + sb_image[b].height(), + vs_height = sm.reduce(lambda a, b: a + sb_image[b].height(), [ 'vtop', 'vbottom', 'vmid' ], 0) - v_height = reduce(lambda a, b: a + sb_image[b].height(), + v_height = sm.reduce(lambda a, b: a + sb_image[b].height(), [ 'aup', 'adown' ], vs_height) - hs_width = reduce(lambda a, b: a + sb_image[b].width(), + hs_width = sm.reduce(lambda a, b: a + sb_image[b].width(), [ 'hleft', 'hright', 'hmid' ], 0) - h_width = reduce(lambda a, b: a + sb_image[b].width(), + h_width = sm.reduce(lambda a, b: a + sb_image[b].width(), [ 'aleft', 'aright' ], hs_width) h_height = sb_image[ 'htrack' ].height() return diff --git a/enable/scrolled.py b/enable/scrolled.py index b8f8d9817..557f32f3f 100644 --- a/enable/scrolled.py +++ b/enable/scrolled.py @@ -585,7 +585,7 @@ def _container_handle_mouse_event(self, event, suffix): def __getstate__(self): state = super(Scrolled,self).__getstate__() for key in ['alternate_vsb', '_vsb', '_hsb', ]: - if state.has_key(key): + if key in state: del state[key] return state diff --git a/enable/tests/component_test_case.py b/enable/tests/component_test_case.py index 2d4a6ccf7..1379ff75c 100644 --- a/enable/tests/component_test_case.py +++ b/enable/tests/component_test_case.py @@ -6,59 +6,59 @@ class ComponentTestCase(unittest.TestCase): def test_position(self): c = Component(bounds=[50.0, 50.0]) - self.assert_(c.position[0] == c.x) - self.assert_(c.position[1] == c.y) - self.assert_(c.x == 0.0) - self.assert_(c.y == 0.0) + self.assertTrue(c.position[0] == c.x) + self.assertTrue(c.position[1] == c.y) + self.assertTrue(c.x == 0.0) + self.assertTrue(c.y == 0.0) return def test_bounds(self): c = Component(bounds=[50.0, 60.0]) - self.assert_(c.width == c.bounds[0]) - self.assert_(c.height == c.bounds[1]) - self.assert_(c.bounds[0] == 50.0) - self.assert_(c.bounds[1] == 60.0) - self.assert_(c.x2 == c.x + 50.0 - 1) - self.assert_(c.y2 == c.y + 60.0 - 1) + self.assertTrue(c.width == c.bounds[0]) + self.assertTrue(c.height == c.bounds[1]) + self.assertTrue(c.bounds[0] == 50.0) + self.assertTrue(c.bounds[1] == 60.0) + self.assertTrue(c.x2 == c.x + 50.0 - 1) + self.assertTrue(c.y2 == c.y + 60.0 - 1) return def test_get_outer_position(self): c = Component(bounds=[50.0, 60.0], padding=10, border_visible=False) - self.assert_(c.outer_x == -10) - self.assert_(c.outer_y == -10) - self.assert_(c.outer_position[0] == -10) - self.assert_(c.outer_position[1] == -10) - self.assert_(c.outer_x2 == 59) - self.assert_(c.outer_y2 == 69) - self.assert_(c.outer_width == 70) - self.assert_(c.outer_height == 80) - self.assert_(c.outer_bounds[0] == 70) - self.assert_(c.outer_bounds[1] == 80) + self.assertTrue(c.outer_x == -10) + self.assertTrue(c.outer_y == -10) + self.assertTrue(c.outer_position[0] == -10) + self.assertTrue(c.outer_position[1] == -10) + self.assertTrue(c.outer_x2 == 59) + self.assertTrue(c.outer_y2 == 69) + self.assertTrue(c.outer_width == 70) + self.assertTrue(c.outer_height == 80) + self.assertTrue(c.outer_bounds[0] == 70) + self.assertTrue(c.outer_bounds[1] == 80) return def test_set_outer_position(self): c = Component(bounds=[50.0, 60.0], padding=10, border_visible=False) # Test setting various things c.outer_position = [0,0] - self.assert_(c.outer_x == 0) - self.assert_(c.outer_y == 0) - self.assert_(c.x == 10) - self.assert_(c.y == 10) - self.assert_(c.outer_x2 == 69) - self.assert_(c.outer_y2 == 79) + self.assertTrue(c.outer_x == 0) + self.assertTrue(c.outer_y == 0) + self.assertTrue(c.x == 10) + self.assertTrue(c.y == 10) + self.assertTrue(c.outer_x2 == 69) + self.assertTrue(c.outer_y2 == 79) c.outer_x = 10 - self.assert_(c.x == 20) - self.assert_(c.outer_x2 == 79) + self.assertTrue(c.x == 20) + self.assertTrue(c.outer_x2 == 79) c.outer_x2 = 99 - self.assert_(c.outer_x2 == 99) - self.assert_(c.outer_x == 30) - self.assert_(c.x2 == 89) - self.assert_(c.x == 40) + self.assertTrue(c.outer_x2 == 99) + self.assertTrue(c.outer_x == 30) + self.assertTrue(c.x2 == 89) + self.assertTrue(c.x == 40) c.outer_y2 = 99 - self.assert_(c.outer_y2 == 99) - self.assert_(c.outer_y == 20) - self.assert_(c.y2 == 89) - self.assert_(c.y == 30) + self.assertTrue(c.outer_y2 == 99) + self.assertTrue(c.outer_y == 20) + self.assertTrue(c.y2 == 89) + self.assertTrue(c.y == 30) return @@ -66,15 +66,15 @@ def test_border(self): c = Component(bounds=[50.0, 60.0], position=[20, 20], padding=10, border_visible=True, border_width=1) - self.assert_(c.outer_x == 10) - self.assert_(c.outer_y == 10) - self.assert_(c.outer_bounds[0] == 70) - self.assert_(c.outer_bounds[1] == 80) + self.assertTrue(c.outer_x == 10) + self.assertTrue(c.outer_y == 10) + self.assertTrue(c.outer_bounds[0] == 70) + self.assertTrue(c.outer_bounds[1] == 80) return def check_container(self): c = Component() - self.assert_(c.container is None) + self.assertTrue(c.container is None) return if __name__ == "__main__": diff --git a/enable/tests/constraints_container_test_case.py b/enable/tests/constraints_container_test_case.py index 8317494a6..93290e3f7 100644 --- a/enable/tests/constraints_container_test_case.py +++ b/enable/tests/constraints_container_test_case.py @@ -33,7 +33,7 @@ def test_equal_size(self): self.c2.layout_height == 10 ] - self.assert_(self.c1.bounds == self.c2.bounds) + self.assertTrue(self.c1.bounds == self.c2.bounds) def test_hbox_order(self): """ Test the order of components in an hbox. @@ -46,7 +46,7 @@ def test_hbox_order(self): ] dx = self.c2.position[0] - self.c1.position[0] - self.assert_(dx > 0) + self.assertTrue(dx > 0) def test_vbox_order(self): """ Test the order of components in a vbox. @@ -59,7 +59,7 @@ def test_vbox_order(self): ] dy = self.c2.position[1] - self.c1.position[1] - self.assert_(dy < 0) + self.assertTrue(dy < 0) def test_alignment_vertical(self): """ Test alignment of components vertically with constraints. @@ -78,8 +78,8 @@ def test_alignment_vertical(self): pos2 = self.c2.position bound2 = self.c2.bounds - self.assert_(pos1[1] + bound1[1] / 2 == self.container.bounds[1] / 2) - self.assert_(pos2[1] + bound2[1] / 2 == self.container.bounds[1] / 2) + self.assertTrue(pos1[1] + bound1[1] / 2 == self.container.bounds[1] / 2) + self.assertTrue(pos2[1] + bound2[1] / 2 == self.container.bounds[1] / 2) def test_alignment_horizontal(self): """ Test alignment of components horizontally with constraints. @@ -98,8 +98,8 @@ def test_alignment_horizontal(self): pos2 = self.c2.position bound2 = self.c2.bounds - self.assert_(pos1[0] + bound1[0] / 2 == self.container.bounds[0] / 2) - self.assert_(pos2[0] + bound2[0] / 2 == self.container.bounds[0] / 2) + self.assertTrue(pos1[0] + bound1[0] / 2 == self.container.bounds[0] / 2) + self.assertTrue(pos2[0] + bound2[0] / 2 == self.container.bounds[0] / 2) def test_constraint_function(self): """ Test using a function to create constraints. @@ -117,7 +117,7 @@ def get_constraints(container): self.container.layout_constraints = get_constraints - self.assert_(self.c1.bounds[0] == self.c2.bounds[0]) + self.assertTrue(self.c1.bounds[0] == self.c2.bounds[0]) def test_invalid_layout(self): """ Make sure proper exceptions are thrown with an invalid layout. @@ -151,7 +151,7 @@ def test_grid_layout(self): space = DefaultSpacing.ABUTMENT c2_pos = [self.c1.position[0] + self.c1.bounds[0] + space, self.c1.position[1]] - self.assert_(self.c2.position == c2_pos) + self.assertTrue(self.c2.position == c2_pos) def test_invalid_grid_layout(self): """ Test an invalid grid layout. @@ -172,7 +172,7 @@ def test_constraint_strength(self): (self.c1.layout_width == 20) | 'strong' ] - self.assert_(self.c1.bounds[0] == 20) + self.assertTrue(self.c1.bounds[0] == 20) def test_share_layout(self): """ Test sharing layouts with a child container. @@ -191,12 +191,12 @@ def test_share_layout(self): align('layout_width', self.c1, self.c2, c3) ] - self.assert_(self.c1.bounds[0] == self.c2.bounds[0] != c3.bounds[0]) + self.assertTrue(self.c1.bounds[0] == self.c2.bounds[0] != c3.bounds[0]) self.child_container.share_layout = True self.container.relayout() - self.assert_(self.c1.bounds[0] == self.c2.bounds[0] == c3.bounds[0]) + self.assertTrue(self.c1.bounds[0] == self.c2.bounds[0] == c3.bounds[0]) def test_layout_manager_initialize(self): """ Ensure that a layout manager can only be initialized once. @@ -222,8 +222,8 @@ def test_layout_manager_replace_constraints(self): manager.initialize(cns) manager.replace_constraints(cns, new_cns) - self.assert_(not manager._solver.hasConstraint(cns[0])) - self.assert_(manager._solver.hasConstraint(new_cns[0])) + self.assertTrue(not manager._solver.hasConstraint(cns[0])) + self.assertTrue(manager._solver.hasConstraint(new_cns[0])) def test_layout_manager_max_size(self): """ Test the max_size method of the LayoutManager. @@ -232,7 +232,7 @@ def test_layout_manager_max_size(self): manager = self.container._layout_manager max_size = manager.get_max_size(self.container.layout_width, self.container.layout_height) - self.assert_(max_size == (-1, -1)) + self.assertTrue(max_size == (-1, -1)) @unittest.skipIf(not ENABLE_CONSTRAINTS, 'kiwisolver not available') @@ -246,9 +246,9 @@ def test_rect(self): rect = Rect(10, 20, 60, 40) - self.assert_(rect.box == Box(20, 70, 60, 10)) - self.assert_(rect.pos == Pos(10, 20)) - self.assert_(rect.size == Size(60, 40)) + self.assertTrue(rect.box == Box(20, 70, 60, 10)) + self.assertTrue(rect.pos == Pos(10, 20)) + self.assertTrue(rect.size == Size(60, 40)) def test_rect_f(self): """ Test the RectF class. @@ -258,9 +258,9 @@ def test_rect_f(self): rect_f = RectF(10.5, 20.5, 60.5, 40.5) - self.assert_(rect_f.box == BoxF(20.5, 71.0, 61.0, 10.5)) - self.assert_(rect_f.pos == PosF(10.5, 20.5)) - self.assert_(rect_f.size == SizeF(60.5, 40.5)) + self.assertTrue(rect_f.box == BoxF(20.5, 71.0, 61.0, 10.5)) + self.assertTrue(rect_f.pos == PosF(10.5, 20.5)) + self.assertTrue(rect_f.size == SizeF(60.5, 40.5)) def test_box(self): """ Test the Box class. @@ -269,10 +269,10 @@ def test_box(self): from enable.layout.geometry import Rect, Box, Pos, Size box = Box(20, 70, 60, 10) - self.assert_(box == Box((20, 70, 60, 10))) - self.assert_(box.rect == Rect(10, 20, 60, 40)) - self.assert_(box.pos == Pos(10, 20)) - self.assert_(box.size == Size(60, 40)) + self.assertTrue(box == Box((20, 70, 60, 10))) + self.assertTrue(box.rect == Rect(10, 20, 60, 40)) + self.assertTrue(box.pos == Pos(10, 20)) + self.assertTrue(box.size == Size(60, 40)) def test_box_f(self): """ Test the BoxF class. @@ -281,10 +281,10 @@ def test_box_f(self): from enable.layout.geometry import RectF, BoxF, PosF, SizeF box_f = BoxF(20.5, 71.0, 61.0, 10.5) - self.assert_(box_f == BoxF((20.5, 71.0, 61.0, 10.5))) - self.assert_(box_f.rect == RectF(10.5, 20.5, 60.5, 40.5)) - self.assert_(box_f.pos == PosF(10.5, 20.5)) - self.assert_(box_f.size == SizeF(60.5, 40.5)) + self.assertTrue(box_f == BoxF((20.5, 71.0, 61.0, 10.5))) + self.assertTrue(box_f.rect == RectF(10.5, 20.5, 60.5, 40.5)) + self.assertTrue(box_f.pos == PosF(10.5, 20.5)) + self.assertTrue(box_f.size == SizeF(60.5, 40.5)) def test_pos(self): """ Test the Pos class. @@ -293,8 +293,8 @@ def test_pos(self): from enable.layout.geometry import Pos pos = Pos(10, 20) - self.assert_(pos.x == 10) - self.assert_(pos.y == 20) + self.assertTrue(pos.x == 10) + self.assertTrue(pos.y == 20) def test_pos_f(self): """ Test the PosF class. @@ -303,8 +303,8 @@ def test_pos_f(self): from enable.layout.geometry import PosF pos_f = PosF(10.5, 20.5) - self.assert_(pos_f.x == 10.5) - self.assert_(pos_f.y == 20.5) + self.assertTrue(pos_f.x == 10.5) + self.assertTrue(pos_f.y == 20.5) def test_size(self): """ Test the Size class. @@ -313,9 +313,9 @@ def test_size(self): from enable.layout.geometry import Size size = Size(40, 20) - self.assert_(size == Size((40, 20))) - self.assert_(size.width == 40) - self.assert_(size.height == 20) + self.assertTrue(size == Size((40, 20))) + self.assertTrue(size.width == 40) + self.assertTrue(size.height == 20) def test_size_f(self): """ Test the SizeF class. @@ -324,9 +324,9 @@ def test_size_f(self): from enable.layout.geometry import SizeF size_f = SizeF(40.5, 20.5) - self.assert_(size_f == SizeF((40.5, 20.5))) - self.assert_(size_f.width == 40.5) - self.assert_(size_f.height == 20.5) + self.assertTrue(size_f == SizeF((40.5, 20.5))) + self.assertTrue(size_f.width == 40.5) + self.assertTrue(size_f.height == 20.5) if __name__ == '__main__': diff --git a/enable/tests/container_test_case.py b/enable/tests/container_test_case.py index cd16259e3..7005dd687 100644 --- a/enable/tests/container_test_case.py +++ b/enable/tests/container_test_case.py @@ -11,7 +11,7 @@ def assert_dims(self, obj, **dims): certain value. e.g. assert_dims(component, x=5.0, y=7.0). """ for dim, val in dims.items(): - self.assert_( getattr(obj, dim) == val ) + self.assertTrue( getattr(obj, dim) == val ) return @@ -33,20 +33,20 @@ def create_simple_components(self): def test_add_remove(self): container = self.create_simple_components() - self.assert_(len(container.components) == 3) + self.assertTrue(len(container.components) == 3) components = container.components container.remove(components[0]) container.remove(components[0]) container.remove(components[0]) - self.assert_(len(container.components) == 0) + self.assertTrue(len(container.components) == 0) return def test_position(self): container = self.create_simple_components() components = container.components - self.assert_(components[0].position == [20,10]) - self.assert_(components[1].position == [40,10]) - self.assert_(components[2].position == [60,10]) + self.assertTrue(components[0].position == [20,10]) + self.assertTrue(components[1].position == [40,10]) + self.assertTrue(components[2].position == [60,10]) return def test_position_bounds(self): @@ -56,7 +56,7 @@ def test_position_bounds(self): def test_auto_size(self): container = Container(bounds=[100.0, 100.0]) - self.assert_(container.auto_size == False) + self.assertTrue(container.auto_size == False) # Add some components c1 = Component(position=[10.0, 10.0], bounds=[50.0, 60.0]) diff --git a/enable/tests/coordinate_box_test_case.py b/enable/tests/coordinate_box_test_case.py index 26066ba37..79dd4626f 100644 --- a/enable/tests/coordinate_box_test_case.py +++ b/enable/tests/coordinate_box_test_case.py @@ -5,31 +5,31 @@ class CoordinateBoxTestCase(unittest.TestCase): def check_position(self): c = CoordinateBox(bounds=[50.0, 50.0]) - self.assert_(c.position[0] == c.x) - self.assert_(c.position[1] == c.y) - self.assert_(c.x == 0.0) - self.assert_(c.y == 0.0) + self.assertTrue(c.position[0] == c.x) + self.assertTrue(c.position[1] == c.y) + self.assertTrue(c.x == 0.0) + self.assertTrue(c.y == 0.0) return def check_bounds(self): c = CoordinateBox(bounds=[50.0, 60.0]) - self.assert_(c.width == c.bounds[0]) - self.assert_(c.height == c.bounds[1]) - self.assert_(c.bounds[0] == 50.0) - self.assert_(c.bounds[1] == 60.0) - self.assert_(c.x2 == 49.0) - self.assert_(c.y2 == 59.0) + self.assertTrue(c.width == c.bounds[0]) + self.assertTrue(c.height == c.bounds[1]) + self.assertTrue(c.bounds[0] == 50.0) + self.assertTrue(c.bounds[1] == 60.0) + self.assertTrue(c.x2 == 49.0) + self.assertTrue(c.y2 == 59.0) return def check_is_in(self): c = CoordinateBox(x=10, y=20) c.width=100 c.height=100 - self.assert_(c.is_in(10, 20)) - self.assert_(c.is_in(100, 100)) - self.assert_(c.is_in(15, 50)) - self.assert_(not c.is_in(0, 0)) - self.assert_(not c.is_in(10, 10)) + self.assertTrue(c.is_in(10, 20)) + self.assertTrue(c.is_in(100, 100)) + self.assertTrue(c.is_in(15, 50)) + self.assertTrue(not c.is_in(0, 0)) + self.assertTrue(not c.is_in(10, 10)) return if __name__ == "__main__": diff --git a/enable/tests/event_transform_test_case.py b/enable/tests/event_transform_test_case.py index c677414f6..f74c0c7cf 100644 --- a/enable/tests/event_transform_test_case.py +++ b/enable/tests/event_transform_test_case.py @@ -3,6 +3,7 @@ import copy import unittest + # Enthought library imports from traits.api import Any, Tuple @@ -19,7 +20,7 @@ def assert_dims(self, obj, **dims): certain value. e.g. assert_dims(component, x=5.0, y=7.0). """ for dim, val in dims.items(): - self.assert_( getattr(obj, dim) == val ) + self.assertTrue( getattr(obj, dim) == val ) return class TestComponent(Component): @@ -95,10 +96,10 @@ def test_simple_container(self): event = BasicEvent(x=105, y=105) outer_container.dispatch(event, "left_down") - self.assert_(comp.last_event.x == 55) - self.assert_(comp.last_event.y == 55) - self.assert_(inner_container.last_event.x == 105) - self.assert_(inner_container.last_event.y == 105) + self.assertTrue(comp.last_event.x == 55) + self.assertTrue(comp.last_event.y == 55) + self.assertTrue(inner_container.last_event.x == 105) + self.assertTrue(inner_container.last_event.y == 105) return def test_viewport_container(self): @@ -115,10 +116,10 @@ def test_viewport_container(self): event = BasicEvent(x=105, y=105) viewport.dispatch(event, "left_down") - self.assert_(container.last_event.x == 75) - self.assert_(container.last_event.y == 75) - self.assert_(comp.last_event.x == 25) - self.assert_(comp.last_event.y == 25) + self.assertTrue(container.last_event.x == 75) + self.assertTrue(container.last_event.y == 75) + self.assertTrue(comp.last_event.x == 25) + self.assertTrue(comp.last_event.y == 25) # Translate the viewport's view_position container.last_event = None @@ -127,10 +128,10 @@ def test_viewport_container(self): event = BasicEvent(x=115, y=115) viewport.dispatch(event, "left_down") - self.assert_(container.last_event.x == 75) - self.assert_(container.last_event.y == 75) - self.assert_(comp.last_event.x == 25) - self.assert_(comp.last_event.y == 25) + self.assertTrue(container.last_event.x == 75) + self.assertTrue(container.last_event.y == 75) + self.assertTrue(comp.last_event.x == 25) + self.assertTrue(comp.last_event.y == 25) # Do a zoom container.last_event = None @@ -143,10 +144,10 @@ def test_viewport_container(self): event = BasicEvent(x=280, y=280) viewport.dispatch(event, "left_down") - self.assert_(container.last_event.x == 75) - self.assert_(container.last_event.y == 75) - self.assert_(comp.last_event.x == 25) - self.assert_(comp.last_event.y == 25) + self.assertTrue(container.last_event.x == 75) + self.assertTrue(container.last_event.y == 75) + self.assertTrue(comp.last_event.x == 25) + self.assertTrue(comp.last_event.y == 25) return def test_mouse_capture(self): @@ -176,15 +177,15 @@ def normal_left_down(self, event): event = BasicEvent(x=105, y=105, window=window) window._handle_mouse_event("left_down", event) - self.assert_(window.mouse_owner == comp) + self.assertTrue(window.mouse_owner == comp) # Create the second event event = BasicEvent(x=107, y=107, window=window) old_pos = comp.captured_event_pos window._handle_mouse_event("left_down", event) new_pos = comp.captured_event_pos - self.assert_(new_pos[0] == old_pos[0] + 2) - self.assert_(new_pos[1] == old_pos[1] + 2) + self.assertTrue(new_pos[0] == old_pos[0] + 2) + self.assertTrue(new_pos[1] == old_pos[1] + 2) return diff --git a/enable/tests/primitives/test_image.py b/enable/tests/primitives/test_image.py index cd555a4d9..61af7bf35 100644 --- a/enable/tests/primitives/test_image.py +++ b/enable/tests/primitives/test_image.py @@ -2,6 +2,9 @@ import os import sys + +import six + if sys.version_info[:2] == (2, 6): import unittest2 as unittest else: @@ -110,8 +113,9 @@ def test_image_gc_32(self): image_gc = self.image_32._image assert_array_equal(image_gc.bmp_array, self.data) + @unittest.skipIf(six.PY3, reason="Crashes on python 3. See GH #95.") def test_draw_24(self): - gc = GraphicsContext((256, 128), pix_format='rgba32') + gc = GraphicsContext((256, 128), pix_format='rgb24') self.image_24.draw(gc) # if test is failing, uncomment this line to see what is drawn #gc.save('test_image_draw_24.png') @@ -119,6 +123,12 @@ def test_draw_24(self): # smoke test: image isn't all white assert_array_equal(gc.bmp_array[..., :3], self.data[..., :3]) + gc2 = GraphicsContext((256, 128), pix_format='rgba32') + self.image_24.draw(gc2) + assert_array_equal(gc2.bmp_array[..., :3], self.data[..., :3]) + + + @unittest.skipIf(six.PY3, reason="Crashes on python 3. See GH #95.") def test_draw_32(self): gc = GraphicsContext((256, 128), pix_format='rgba32') self.image_32.draw(gc) @@ -130,6 +140,7 @@ def test_draw_32(self): white_image = np.ones(shape=(256, 128, 4), dtype='uint8')*255 self.assertFalse(np.array_equal(white_image, gc.bmp_array)) + @unittest.skipIf(six.PY3, reason="Crashes on python 3. See GH #95.") def test_draw_stretched(self): gc = GraphicsContext((256, 256), pix_format='rgba32') self.image_32.bounds = [128, 258] diff --git a/enable/tests/viewport_test_case.py b/enable/tests/viewport_test_case.py index 0b4efb623..3f5095b74 100644 --- a/enable/tests/viewport_test_case.py +++ b/enable/tests/viewport_test_case.py @@ -1,3 +1,5 @@ +from __future__ import print_function + import unittest from enable.api import Component, Container, Viewport @@ -16,16 +18,16 @@ def test_basic_viewport(self): bounds=[50,50]) self.assertEqual(view.view_position, [10, 10]) - print view.components_at(0.0, 0.0), view.view_position - self.assert_(view.components_at(0.0, 0.0)[0] == component) - self.assert_(view.components_at(44.9, 0.0)[0] == component) - self.assert_(view.components_at(0.0, 44.9)[0] == component) - self.assert_(view.components_at(44.9, 44.9)[0] == component) - - self.assert_(view.components_at(46.0, 45.0) == []) - self.assert_(view.components_at(46.0, 0.0) == []) - self.assert_(view.components_at(45.0, 46.0) == []) - self.assert_(view.components_at(0.0, 46.0) == []) + print(view.components_at(0.0, 0.0), view.view_position) + self.assertTrue(view.components_at(0.0, 0.0)[0] == component) + self.assertTrue(view.components_at(44.9, 0.0)[0] == component) + self.assertTrue(view.components_at(0.0, 44.9)[0] == component) + self.assertTrue(view.components_at(44.9, 44.9)[0] == component) + + self.assertTrue(view.components_at(46.0, 45.0) == []) + self.assertTrue(view.components_at(46.0, 0.0) == []) + self.assertTrue(view.components_at(45.0, 46.0) == []) + self.assertTrue(view.components_at(0.0, 46.0) == []) def test_initial_position(self): container = Container(bounds=[100.0, 100.0]) diff --git a/enable/text_field.py b/enable/text_field.py index 56a664fda..80c46acd7 100644 --- a/enable/text_field.py +++ b/enable/text_field.py @@ -5,6 +5,8 @@ from math import floor, sqrt from bisect import insort_left +import six.moves as sm + # Enthought library imports from traits.api import (Bool, Int, Event, Instance, Any, Property, List, DelegatesTo) @@ -390,7 +392,7 @@ def _realign_horz(self): """ Realign all the text being drawn such that the first character being drawn in each line is the one at index '_draw_text_xstart.' """ - for i in xrange(len(self.__draw_text)): + for i in sm.range(len(self.__draw_text)): line = self._text[self._draw_text_ystart + i] self.__draw_text[i] = self._clip_line(line, self._draw_text_xstart) @@ -475,7 +477,7 @@ def _get__draw_text(self): self.__draw_text = [] self._draw_text_xstart, self._draw_text_ystart = 0, 0 end = min(len(self._text), self._text_height) - for i in xrange(self._draw_text_ystart, end): + for i in sm.range(self._draw_text_ystart, end): line = self._clip_line(self._text[i], 0) self.__draw_text.append(line) else: diff --git a/enable/toolkit.py b/enable/toolkit.py index 75593ab05..41cfd1a30 100644 --- a/enable/toolkit.py +++ b/enable/toolkit.py @@ -35,9 +35,9 @@ def _init_toolkit(): __import__(backend) except (ImportError, SystemExit): t, v, _tb = sys.exc_info() - raise ImportError, "Unable to import the %s backend for the %s " \ + raise ImportError("Unable to import the %s backend for the %s " "toolkit (reason: %s)." % (ETSConfig.kiva_backend, ETSConfig.toolkit, - format_exception_only(t, v)) + format_exception_only(t, v))) # Save the imported toolkit module. global _toolkit_backend diff --git a/enable/tools/api.py b/enable/tools/api.py index e483ed3b4..e7db0ba0a 100644 --- a/enable/tools/api.py +++ b/enable/tools/api.py @@ -1,8 +1,8 @@ -from drag_tool import DragTool -from hover_tool import HoverTool -from move_tool import MoveTool -from resize_tool import ResizeTool -from traits_tool import TraitsTool -from viewport_pan_tool import ViewportPanTool -from viewport_zoom_tool import ViewportZoomTool -from value_drag_tool import ValueDragTool, AttributeDragTool \ No newline at end of file +from .drag_tool import DragTool +from .hover_tool import HoverTool +from .move_tool import MoveTool +from .resize_tool import ResizeTool +from .traits_tool import TraitsTool +from .viewport_pan_tool import ViewportPanTool +from .viewport_zoom_tool import ViewportZoomTool +from .value_drag_tool import ValueDragTool, AttributeDragTool \ No newline at end of file diff --git a/enable/tools/drag_tool.py b/enable/tools/drag_tool.py index 66b4ba80d..59b5d4c28 100644 --- a/enable/tools/drag_tool.py +++ b/enable/tools/drag_tool.py @@ -1,5 +1,6 @@ """ Defines the base DragTool class. """ +import six.moves as sm # Enthought library imports from traits.api import Bool, Enum, Tuple, Property, cached_property, List, Str from enable.base_tool import BaseTool, KeySpec @@ -133,7 +134,7 @@ def _cancel_drag(self, event): def _drag_cancel_keypressed(self, event): if self._drag_state != "nondrag" and \ - any(map(lambda x: x.match(event), self._cancel_keys)): + any(sm.map(lambda x: x.match(event), self._cancel_keys)): return self._cancel_drag(event) else: return False diff --git a/enable/tools/hover_tool.py b/enable/tools/hover_tool.py index e9648fe6e..ad2674e18 100644 --- a/enable/tools/hover_tool.py +++ b/enable/tools/hover_tool.py @@ -31,8 +31,8 @@ def GetGlobalMousePosition(): else: def GetGlobalMousePosition(): - raise NotImplementedError, "GetGlobalMousePosition is not defined for" \ - "toolkit '%s'." % ETSConfig.toolkit + raise NotImplementedError("GetGlobalMousePosition is not defined for" + "toolkit '%s'." % ETSConfig.toolkit) class HoverTool(BaseTool): diff --git a/enable/tools/move_tool.py b/enable/tools/move_tool.py index db053c16d..1f0ffda4c 100644 --- a/enable/tools/move_tool.py +++ b/enable/tools/move_tool.py @@ -1,7 +1,7 @@ from traits.api import Bool, Enum, Tuple -from drag_tool import DragTool +from .drag_tool import DragTool class MoveTool(DragTool): diff --git a/enable/tools/toolbars/toolbar_buttons.py b/enable/tools/toolbars/toolbar_buttons.py index 81f5a64e4..d739b164d 100644 --- a/enable/tools/toolbars/toolbar_buttons.py +++ b/enable/tools/toolbars/toolbar_buttons.py @@ -1,5 +1,5 @@ -from __future__ import with_statement +from __future__ import with_statement, print_function # Enthought library imports from enable.api import ColorTrait, Component @@ -147,5 +147,5 @@ class SampleButtonButton(Button): label = Str('Sample Button') def perform(self, event): - print "this button is a sample" + print("this button is a sample") return diff --git a/enable/tools/toolbars/viewport_toolbar.py b/enable/tools/toolbars/viewport_toolbar.py index 3329a33c0..399ae7348 100644 --- a/enable/tools/toolbars/viewport_toolbar.py +++ b/enable/tools/toolbars/viewport_toolbar.py @@ -9,7 +9,7 @@ from traits.api import Enum, Bool, Float, Int, Type, List # Local imports -from toolbar_buttons import Button +from .toolbar_buttons import Button class ViewportToolbar(Container, AbstractOverlay): """ diff --git a/enable/tools/value_drag_tool.py b/enable/tools/value_drag_tool.py index c9ad64ca1..69622eca0 100644 --- a/enable/tools/value_drag_tool.py +++ b/enable/tools/value_drag_tool.py @@ -15,6 +15,7 @@ potentially be used as the basis for many different interactions, """ +import six from traits.api import Str, Float, Set, Enum, Bool, Tuple, Dict, Event, Any, Either @@ -208,13 +209,13 @@ def set_delta(self, value, delta_x, delta_y): if self.x_attr: x_value = value[0] + delta_x if self.x_bounds[0] is not None: - if isinstance(self.x_bounds[0], basestring): + if isinstance(self.x_bounds[0], six.string_types): m = getattr(self.model, self.x_bounds[0]) else: m = self.x_bounds[0] x_value = max(x_value, m) if self.x_bounds[1] is not None: - if isinstance(self.x_bounds[1], basestring): + if isinstance(self.x_bounds[1], six.string_types): M = getattr(self.model, self.x_bounds[1]) else: M = self.x_bounds[1] @@ -224,13 +225,13 @@ def set_delta(self, value, delta_x, delta_y): if self.y_attr: y_value = value[1] + delta_y if self.y_bounds[0] is not None: - if isinstance(self.y_bounds[0], basestring): + if isinstance(self.y_bounds[0], six.string_types): m = getattr(self.model, self.y_bounds[0]) else: m = self.y_bounds[0] y_value = max(y_value, m) if self.y_bounds[1] is not None: - if isinstance(self.y_bounds[1], basestring): + if isinstance(self.y_bounds[1], six.string_types): M = getattr(self.model, self.y_bounds[1]) else: M = self.y_bounds[1] diff --git a/enable/tools/viewport_pan_tool.py b/enable/tools/viewport_pan_tool.py index 4229cdbee..2393a614c 100644 --- a/enable/tools/viewport_pan_tool.py +++ b/enable/tools/viewport_pan_tool.py @@ -4,7 +4,7 @@ from enable.enable_traits import Pointer from traits.api import Bool, Enum, Float, Tuple -from drag_tool import DragTool +from .drag_tool import DragTool class ViewportPanTool(DragTool): """ A tool that enables the user to pan around a viewport by clicking a diff --git a/enable/tools/viewport_zoom_tool.py b/enable/tools/viewport_zoom_tool.py index 5a39f96cf..458648078 100644 --- a/enable/tools/viewport_zoom_tool.py +++ b/enable/tools/viewport_zoom_tool.py @@ -10,8 +10,9 @@ from enable.base_tool import KeySpec from enable.colors import ColorTrait from enable.abstract_overlay import AbstractOverlay -from base_zoom_tool import BaseZoomTool -from tool_history_mixin import ToolHistoryMixin + +from .base_zoom_tool import BaseZoomTool +from .tool_history_mixin import ToolHistoryMixin class ViewportZoomTool(AbstractOverlay, ToolHistoryMixin, BaseZoomTool): """ Selects a range along the index or value axis. diff --git a/enable/trait_defs/ui/api.py b/enable/trait_defs/ui/api.py index 12813f292..a0e3370a1 100644 --- a/enable/trait_defs/ui/api.py +++ b/enable/trait_defs/ui/api.py @@ -1 +1 @@ -from rgba_color_editor import RGBAColorEditor +from .rgba_color_editor import RGBAColorEditor diff --git a/enable/vtk_backend/vtk_window.py b/enable/vtk_backend/vtk_window.py index cd5499192..16ea786e8 100644 --- a/enable/vtk_backend/vtk_window.py +++ b/enable/vtk_backend/vtk_window.py @@ -1,5 +1,7 @@ import warnings +import six + from tvtk.api import tvtk from tvtk import messenger from traits.api import HasTraits, Any, Callable, Property, Instance, \ @@ -281,6 +283,7 @@ def _vtk_mouse_wheel(self, vtk_obj, eventname): self._pass_event_to_vtk(vtk_obj, eventname) def _create_key_event(self, vtk_event, event_type): + # FIXME: THIS IS A BUG focus_owner = self.focus_owner if focus_owner is None: @@ -290,11 +293,11 @@ def _create_key_event(self, vtk_event, event_type): return self._pass_event_to_vtk(vtk_obj, eventname) if event_type == 'character': - key = unicode(self.control.key_sym) + key = six.text_type(self.control.key_sym) else: key = KEY_MAP.get(self.control.key_sym, None) if key is None: - key = unicode(self.control.key_sym) + key = six.text_type(self.control.key_sym) if not key: return @@ -467,7 +470,7 @@ def _paint(self, event=None): try: ary = ascontiguousarray(self._gc.bmp_array[::-1, :, :4]) ary_2d = reshape(ary, (width * height, 4)) - except Exception, e: + except Exception as e: warnings.warn("Error reshaping array of shape %s to width and height of (%d, %d)" % (str(ary.shape), width, height)) return @@ -522,7 +525,7 @@ def _set_padding(self, val): else: # assume padding is some sort of array type if len(val) != 4: - raise RuntimeError, "Padding must be a 4-element sequence type or an int. Instead, got" + str(val) + raise RuntimeError("Padding must be a 4-element sequence type or an int. Instead, got" + str(val)) self.padding_left = val[0] self.padding_right = val[1] self.padding_top = val[2] diff --git a/enable/wx/base_window.py b/enable/wx/base_window.py index 5a78fb120..03720745e 100644 --- a/enable/wx/base_window.py +++ b/enable/wx/base_window.py @@ -7,6 +7,9 @@ import sys import time + +import six + import wx from traits.api import Any, Instance, Trait @@ -315,7 +318,7 @@ def _create_key_event(self, event_type, event): if focus_owner is not None: if event_type == 'character': - key = unichr(event.GetUniChar()) + key = six.unichr(event.GetUniChar()) if not key: return None else: @@ -323,7 +326,7 @@ def _create_key_event(self, event_type, event): if key_code in KEY_MAP: key = KEY_MAP.get(key_code) else: - key = unichr(event.GetUniChar()).lower() + key = six.unichr(event.GetUniChar()).lower() # Use the last-seen mouse coordinates instead of GetX/GetY due # to wx bug. @@ -473,7 +476,7 @@ def get_pointer_position(self): def set_drag_result(self, result): if result not in DRAG_RESULTS_MAP: - raise RuntimeError, "Unknown drag result '%s'" % result + raise RuntimeError("Unknown drag result '%s'" % result) self._drag_result = DRAG_RESULTS_MAP[result] return diff --git a/enable/wx/cairo.py b/enable/wx/cairo.py index ec2a342d8..5fd29524b 100644 --- a/enable/wx/cairo.py +++ b/enable/wx/cairo.py @@ -9,6 +9,8 @@ # Thanks for using Enthought open source! #------------------------------------------------------------------------------ +import six.moves as sm + import wx from kiva.cairo import CompiledPath, GraphicsContext, font_metrics_provider @@ -16,6 +18,9 @@ from .base_window import BaseWindow from .scrollbar import NativeScrollBar +from enable.base import union_bounds + + class Window(BaseWindow): def _create_gc(self, size, pix_format="bgra32"): "Create a Kiva graphics context of a specified size" @@ -34,7 +39,7 @@ def _window_paint(self, event): wdc = control._dc = wx.PaintDC(control) self._update_region = None if self._update_region is not None: - update_bounds = reduce(union_bounds, self._update_region) + update_bounds = sm.reduce(union_bounds, self._update_region) pixel_map.draw_to_wxwindow(control, int(update_bounds[0]), int(update_bounds[1]), width=int(update_bounds[2]), height=int(update_bounds[3])) else: diff --git a/enable/wx/constants.py b/enable/wx/constants.py index 35c2d086e..f25f67170 100644 --- a/enable/wx/constants.py +++ b/enable/wx/constants.py @@ -12,6 +12,7 @@ from __future__ import absolute_import import warnings + import wx from ..toolkit_constants import ( diff --git a/examples/enable/basic_move.py b/examples/enable/basic_move.py index f6a0f0bb1..ae5d758c9 100644 --- a/examples/enable/basic_move.py +++ b/examples/enable/basic_move.py @@ -1,6 +1,8 @@ """ This allows a simple component to be moved around the screen. """ +from __future__ import print_function + from enable.example_support import DemoFrame, demo_main from traits.api import Float diff --git a/examples/enable/compass_example.py b/examples/enable/compass_example.py index b5e875b7f..c5bc7a3cb 100644 --- a/examples/enable/compass_example.py +++ b/examples/enable/compass_example.py @@ -1,3 +1,5 @@ +from __future__ import print_function + from enable.api import OverlayContainer, Compass, Window from enable.example_support import demo_main, DemoFrame diff --git a/examples/enable/component_demo.py b/examples/enable/component_demo.py index f74977d8a..af1f5456b 100644 --- a/examples/enable/component_demo.py +++ b/examples/enable/component_demo.py @@ -1,6 +1,8 @@ """ Basic demo of drawing within an Enable component. """ +from __future__ import print_function + from enable.api import Component, ComponentEditor from traits.api import HasTraits, Instance from traitsui.api import Item, View diff --git a/examples/enable/constraints_demo.py b/examples/enable/constraints_demo.py index 62bb38722..0389f1fff 100644 --- a/examples/enable/constraints_demo.py +++ b/examples/enable/constraints_demo.py @@ -80,7 +80,7 @@ def _constraints_def_changed(self): try: new_cns = eval(self.constraints_def) - except Exception, ex: + except Exception as ex: return canvas.layout_constraints = new_cns @@ -99,7 +99,7 @@ def _child_constraints_def_changed(self): try: new_cns = eval(self.child_constraints_def) - except Exception, ex: + except Exception as ex: return canvas.layout_constraints = new_cns diff --git a/examples/enable/slider_example.py b/examples/enable/slider_example.py index 994619a8d..be60b65b9 100644 --- a/examples/enable/slider_example.py +++ b/examples/enable/slider_example.py @@ -1,3 +1,5 @@ +from __future__ import print_function + from enable.api import OverlayContainer, Slider, Window from enable.example_support import demo_main, DemoFrame diff --git a/examples/enable/tools/pyface/context_menu.py b/examples/enable/tools/pyface/context_menu.py index 0c3b6b806..8b1f2da12 100644 --- a/examples/enable/tools/pyface/context_menu.py +++ b/examples/enable/tools/pyface/context_menu.py @@ -2,6 +2,8 @@ This demonstrates the most basic drawing capabilities using Enable. A new component is created and added to a container. """ +from __future__ import print_function + from enable.example_support import DemoFrame, demo_main from enable.api import Component, Container, Window from enable.tools.pyface.context_menu_tool import ContextMenuTool @@ -22,7 +24,7 @@ def _draw_mainlayer(self, gc, view_bounds=None, mode="default"): class MyFrame(DemoFrame): def hello(self): - print "Hello World" + print("Hello World") def _create_window(self): box = Box(bounds=[100.0, 100.0], position=[50.0, 50.0]) diff --git a/examples/enable/zoomed_event_demo.py b/examples/enable/zoomed_event_demo.py index 13fd3c8fc..1913e2037 100644 --- a/examples/enable/zoomed_event_demo.py +++ b/examples/enable/zoomed_event_demo.py @@ -1,6 +1,8 @@ """ Use mouse wheel to zoom and right-click to pan the viewport. """ +from __future__ import print_function + from traits.api import Float from enable.api import (AbstractOverlay, Canvas, Viewport, Window, ColorTrait, @@ -18,7 +20,7 @@ def normal_drag_over(self, event): def normal_dropped_on(self, event): self.window.set_drag_result("link") - print event.obj + print(event.obj) box = Box(x=event.x-2, y=event.y-2, width=4, height=4) self.add(box) diff --git a/examples/kiva/agg/benchmark.py b/examples/kiva/agg/benchmark.py index f6ac580fc..b417b5724 100644 --- a/examples/kiva/agg/benchmark.py +++ b/examples/kiva/agg/benchmark.py @@ -1,7 +1,7 @@ """ Benchmarks Agg rendering times. """ - +from __future__ import print_function import time diff --git a/examples/kiva/agg/dash.py b/examples/kiva/agg/dash.py index 31503309e..7efc5e81c 100644 --- a/examples/kiva/agg/dash.py +++ b/examples/kiva/agg/dash.py @@ -1,3 +1,5 @@ +from __future__ import print_function + import time from numpy import array diff --git a/examples/kiva/agg/lion.py b/examples/kiva/agg/lion.py index 914c12cd5..0349ee616 100644 --- a/examples/kiva/agg/lion.py +++ b/examples/kiva/agg/lion.py @@ -1,3 +1,5 @@ +from __future__ import print_function + import time import sys diff --git a/examples/kiva/agg/polygon_hit_test.py b/examples/kiva/agg/polygon_hit_test.py index 5d016259d..eae23d9c9 100644 --- a/examples/kiva/agg/polygon_hit_test.py +++ b/examples/kiva/agg/polygon_hit_test.py @@ -1,3 +1,5 @@ +from __future__ import print_function + import numpy from kiva.api import points_in_polygon diff --git a/examples/kiva/agg/simple.py b/examples/kiva/agg/simple.py index 76dec785c..5c2c44281 100644 --- a/examples/kiva/agg/simple.py +++ b/examples/kiva/agg/simple.py @@ -1,3 +1,5 @@ +from __future__ import print_function + from kiva import agg from kiva import constants diff --git a/examples/kiva/agg/simple_clip.py b/examples/kiva/agg/simple_clip.py index 4d789da30..b7bc53ace 100644 --- a/examples/kiva/agg/simple_clip.py +++ b/examples/kiva/agg/simple_clip.py @@ -1,3 +1,5 @@ +from __future__ import print_function + import time from kiva import agg diff --git a/examples/kiva/agg/star_path.py b/examples/kiva/agg/star_path.py index 6dde692c9..446d46a3d 100644 --- a/examples/kiva/agg/star_path.py +++ b/examples/kiva/agg/star_path.py @@ -1,4 +1,4 @@ - +from __future__ import print_function from math import sin, cos, pi diff --git a/examples/kiva/agg/text_ex.py b/examples/kiva/agg/text_ex.py index a24b81f67..fbd68893b 100644 --- a/examples/kiva/agg/text_ex.py +++ b/examples/kiva/agg/text_ex.py @@ -1,4 +1,4 @@ - +from __future__ import print_function import time from kiva.fonttools import Font diff --git a/examples/kiva/dash.py b/examples/kiva/dash.py index fe2666c01..bf6742256 100644 --- a/examples/kiva/dash.py +++ b/examples/kiva/dash.py @@ -1,3 +1,5 @@ +from __future__ import print_function + import time import numpy diff --git a/examples/kiva/simple_clip.py b/examples/kiva/simple_clip.py index 8fea58d60..0769d6b05 100644 --- a/examples/kiva/simple_clip.py +++ b/examples/kiva/simple_clip.py @@ -1,3 +1,5 @@ +from __future__ import print_function + import time from kiva.image import GraphicsContext diff --git a/examples/kiva_explorer.py b/examples/kiva_explorer.py index 1255f7abd..ddf236b31 100644 --- a/examples/kiva_explorer.py +++ b/examples/kiva_explorer.py @@ -64,7 +64,7 @@ def _draw_mainlayer(self, gc, view_bounds=None, mode="default"): try: self.error = '' start_time = time.time() - exec self._draw_code in {}, {'gc': gc} + exec(self._draw_code in {}, {'gc': gc}) self.last_draw_time = time.time() - start_time except Exception as exc: self.error = str(exc) diff --git a/examples/savage/buttons_on_canvas.py b/examples/savage/buttons_on_canvas.py index d15d392bf..5c9fac41f 100644 --- a/examples/savage/buttons_on_canvas.py +++ b/examples/savage/buttons_on_canvas.py @@ -1,4 +1,4 @@ - +from __future__ import print_function import os.path import xml.etree.cElementTree as etree diff --git a/kiva/__init__.py b/kiva/__init__.py index 6ce2e67bc..f770ea310 100644 --- a/kiva/__init__.py +++ b/kiva/__init__.py @@ -21,7 +21,7 @@ from .fonttools import Font import os -if os.environ.has_key('KIVA_WISHLIST'): +if 'KIVA_WISHLIST' in os.environ: from warnings import warn warn("Use of the KIVA_WISHLIST environment variable to select Kiva backends" "is no longer supported.") diff --git a/kiva/_fontdata.py b/kiva/_fontdata.py index 578004864..3ebe54ddd 100644 --- a/kiva/_fontdata.py +++ b/kiva/_fontdata.py @@ -31,7 +31,6 @@ widthVectorsByFont fontName -> vector of widths """ -import string import os import sys @@ -112,7 +111,7 @@ def __setitem__(self,x,v): y = x.lower() if y[-8:]=='encoding': y = y[:-8] y = self._XMap[y] - if y in self.keys(): raise IndexError, 'Encoding %s is already set' % y + if y in self: raise IndexError('Encoding %s is already set' % y) self.data[y] = v def __getitem__(self,x): @@ -1246,7 +1245,7 @@ def __getitem__(self,x): # Courier can be expressed more compactly! _w = {} -for charname in widthsByFontGlyph['Helvetica'].keys(): +for charname in widthsByFontGlyph['Helvetica']: _w[charname] = 600 widthsByFontGlyph['Courier'] = _w widthsByFontGlyph['Courier-Bold'] = _w diff --git a/kiva/abstract_graphics_context.py b/kiva/abstract_graphics_context.py index 0b3c37fa9..83dd8c41f 100644 --- a/kiva/abstract_graphics_context.py +++ b/kiva/abstract_graphics_context.py @@ -2,14 +2,14 @@ from abc import ABCMeta, abstractmethod -from .constants import FILL_STROKE, SQUARE_MARKER +import six +from .constants import FILL_STROKE, SQUARE_MARKER +@six.add_metaclass(ABCMeta) class AbstractGraphicsContext(object): """ Abstract Base Class for Kiva Graphics Contexts """ - __metaclass__ = ABCMeta - # ---------------------------------------------------------------- # Save/Restore graphics state. # ---------------------------------------------------------------- diff --git a/kiva/agg/__init__.py b/kiva/agg/__init__.py index 047455b47..45438e7e5 100644 --- a/kiva/agg/__init__.py +++ b/kiva/agg/__init__.py @@ -26,7 +26,7 @@ def __init__(self, pix_format=default_pix_format, interpolation="nearest", bottom_up=True): - assert isinstance(size, types.TupleType), repr(size) + assert isinstance(size, tuple), repr(size) width,height = size pixel_map = PixelMap( width, @@ -40,7 +40,7 @@ def __init__(self, bottom_up) self.pixel_map = pixel_map -except ImportError, ex: +except ImportError as ex: # warn to stderr containing the exception. The warning should # be an ImportWarning, but that is python 2.5+ specific import warnings diff --git a/kiva/agg/freetype2/src/tools/chktrcmp.py b/kiva/agg/freetype2/src/tools/chktrcmp.py index d0f342e6b..a0186b61c 100755 --- a/kiva/agg/freetype2/src/tools/chktrcmp.py +++ b/kiva/agg/freetype2/src/tools/chktrcmp.py @@ -24,20 +24,20 @@ for i in range( 1, len( sys.argv ) ): if sys.argv[i].startswith( "--help" ): - print "Usage: %s [option]" % sys.argv[0] - print "Search used-but-defined and defined-but-not-used trace_XXX macros" - print "" - print " --help:" - print " Show this help" - print "" - print " --src-dirs=dir1:dir2:..." - print " Specify the directories of C source files to be checked" - print " Default is %s" % ":".join( SRC_FILE_DIRS ) - print "" - print " --def-files=file1:file2:..." - print " Specify the header files including FT_TRACE_DEF()" - print " Default is %s" % ":".join( TRACE_DEF_FILES ) - print "" + print("Usage: %s [option]" % sys.argv[0]) + print("Search used-but-defined and defined-but-not-used trace_XXX macros") + print() + print(" --help:") + print(" Show this help") + print() + print(" --src-dirs=dir1:dir2:...") + print(" Specify the directories of C source files to be checked") + print(" Default is %s" % ":".join( SRC_FILE_DIRS )) + print() + print(" --def-files=file1:file2:...") + print(" Specify the header files including FT_TRACE_DEF()") + print(" Default is %s" % ":".join( TRACE_DEF_FILES )) + print() exit(0) if sys.argv[i].startswith( "--src-dirs=" ): SRC_FILE_DIRS = sys.argv[i].replace( "--src-dirs=", "", 1 ).split( ":" ) @@ -86,8 +86,8 @@ component_name = trace_def_pat_opn.sub( '', hdr_line ) component_name = trace_def_pat_cls.sub( '', component_name ) if component_name in KNOWN_COMPONENT: - print "trace component %s is defined twice, see %s and fttrace.h:%d" % \ - ( component_name, KNOWN_COMPONENT[component_name], line_num ) + print("trace component %s is defined twice, see %s and fttrace.h:%d" % + ( component_name, KNOWN_COMPONENT[component_name], line_num )) else: KNOWN_COMPONENT[component_name] = "%s:%d" % \ ( os.path.basename( f ), line_num ) @@ -97,18 +97,16 @@ # Compare the used and defined trace macros. # -print "# Trace component used in the implementations but not defined in fttrace.h." -cmpnt = USED_COMPONENT.keys() -cmpnt.sort() +print("# Trace component used in the implementations but not defined in fttrace.h.") +cmpnt = sorted(USED_COMPONENT.keys()) for c in cmpnt: if c not in KNOWN_COMPONENT: - print "Trace component %s (used in %s) is not defined." % ( c, ", ".join( USED_COMPONENT[c] ) ) + print("Trace component %s (used in %s) is not defined." % ( c, ", ".join( USED_COMPONENT[c] ) )) -print "# Trace component is defined but not used in the implementations." -cmpnt = KNOWN_COMPONENT.keys() -cmpnt.sort() +print("# Trace component is defined but not used in the implementations.") +cmpnt = sorted(KNOWN_COMPONENT.keys()) for c in cmpnt: if c not in USED_COMPONENT: if c != "any": - print "Trace component %s (defined in %s) is not used." % ( c, KNOWN_COMPONENT[c] ) + print("Trace component %s (defined in %s) is not used." % ( c, KNOWN_COMPONENT[c] )) diff --git a/kiva/agg/freetype2/src/tools/cordic.py b/kiva/agg/freetype2/src/tools/cordic.py index 3f80c5f09..0cabd352e 100644 --- a/kiva/agg/freetype2/src/tools/cordic.py +++ b/kiva/agg/freetype2/src/tools/cordic.py @@ -1,6 +1,8 @@ # compute arctangent table for CORDIC computations in fttrigon.c import sys, math +import six.moves as sm + #units = 64*65536.0 # don't change !! units = 256 scale = units/math.pi @@ -32,12 +34,11 @@ def print_val( n, x ): comma = ", " -print "" -print "table of arctan( 1/2^n ) for PI = " + repr(units/65536.0) + " units" +print() +print("table of arctan( 1/2^n ) for PI = " + repr(units/65536.0) + " units") # compute range of "i" -r = [-1] -r = r + range(32) +r = list(sm.range(-1, 32)) for n in r: @@ -71,9 +72,9 @@ def print_val( n, x ): shrink = shrink * math.cos( angle2/scale) -print -print "shrink factor = " + repr( shrink ) -print "shrink factor 2 = " + repr( shrink * (2.0**32) ) -print "expansion factor = " + repr(1/shrink) -print "" +print() +print("shrink factor = " + repr( shrink )) +print("shrink factor 2 = " + repr( shrink * (2.0**32) )) +print("expansion factor = " + repr(1/shrink)) +print() diff --git a/kiva/agg/freetype2/src/tools/docmaker/content.py b/kiva/agg/freetype2/src/tools/docmaker/content.py index b398955b8..f640ae959 100644 --- a/kiva/agg/freetype2/src/tools/docmaker/content.py +++ b/kiva/agg/freetype2/src/tools/docmaker/content.py @@ -5,9 +5,10 @@ # comment blocks and build more structured objects out of them. # -from sources import * -from utils import * +from .sources import * +from .utils import * import string, re +import sys # this regular expression is used to detect code sequences. these @@ -60,14 +61,14 @@ def __init__( self, margin, lines ): # remove margin spaces for l in lines: - if string.strip( l[:margin] ) == "": + if l[:margin].strip() == "": l = l[margin:] self.lines.append( l ) def dump( self, prefix = "", width = 60 ): lines = self.dump_lines( 0, width ) for l in lines: - print prefix + l + print(prefix + l) def dump_lines( self, margin = 0, width = 60 ): result = [] @@ -95,7 +96,7 @@ def __init__( self, lines ): def dump( self, prefix = "", width = 60 ): lines = self.dump_lines( 0, width ) for l in lines: - print prefix + l + print(prefix + l) def dump_lines( self, margin = 0, width = 60 ): cur = "" # current line @@ -198,13 +199,13 @@ def __init__( self, name, lines ): def dump( self, prefix = "" ): if self.field: - print prefix + self.field + " ::" + print(prefix + self.field + " ::") prefix = prefix + "----" first = 1 for p in self.items: if not first: - print "" + print() p.dump( prefix ) first = 0 @@ -278,10 +279,10 @@ def get_start( self ): return "ERROR" def dump( self, margin ): - print " " * margin + "<" + self.tag + ">" + print(" " * margin + "<" + self.tag + ">") for f in self.fields: f.dump( " " ) - print " " * margin + "" + print(" " * margin + "") @@ -352,7 +353,7 @@ def __init__( self ): def set_section( self, section_name ): """set current section during parsing""" - if not self.sections.has_key( section_name ): + if section_name not in self.sections: section = DocSection( section_name ) self.sections[section_name] = section self.section = section @@ -446,7 +447,7 @@ def finish( self ): # listed there for chap in self.chapters: for sec in chap.order: - if self.sections.has_key( sec ): + if sec in self.sections: section = self.sections[sec] section.chapter = chap section.reorder() diff --git a/kiva/agg/freetype2/src/tools/docmaker/docbeauty.py b/kiva/agg/freetype2/src/tools/docmaker/docbeauty.py index 3ddf4a94a..3b25e8203 100644 --- a/kiva/agg/freetype2/src/tools/docmaker/docbeauty.py +++ b/kiva/agg/freetype2/src/tools/docmaker/docbeauty.py @@ -6,11 +6,11 @@ # in the FreeType 2 public headers. # -from sources import * -from content import * -from utils import * +from .sources import * +from .content import * +from .utils import * -import utils +from . import utils import sys, os, time, string, getopt @@ -40,13 +40,13 @@ def beautify_block( block ): def usage(): - print "\nDocBeauty 0.1 Usage information\n" - print " docbeauty [options] file1 [file2 ...]\n" - print "using the following options:\n" - print " -h : print this page" - print " -b : backup original files with the 'orig' extension" - print "" - print " --backup : same as -b" + print("\nDocBeauty 0.1 Usage information\n") + print(" docbeauty [options] file1 [file2 ...]\n") + print("using the following options:\n") + print(" -h : print this page") + print(" -b : backup original files with the 'orig' extension") + print() + print(" --backup : same as -b") def main( argv ): @@ -55,8 +55,8 @@ def main( argv ): global output_dir try: - opts, args = getopt.getopt( sys.argv[1:], \ - "hb", \ + opts, args = getopt.getopt( sys.argv[1:], + "hb", ["help", "backup"] ) except getopt.GetoptError: usage() diff --git a/kiva/agg/freetype2/src/tools/docmaker/docmaker.py b/kiva/agg/freetype2/src/tools/docmaker/docmaker.py index 1d9de9fbf..9bb4d4433 100644 --- a/kiva/agg/freetype2/src/tools/docmaker/docmaker.py +++ b/kiva/agg/freetype2/src/tools/docmaker/docmaker.py @@ -13,29 +13,29 @@ # to speed things significantly. # -from sources import * -from content import * -from utils import * -from formatter import * -from tohtml import * +from .sources import * +from .content import * +from .utils import * +from .formatter import * +from .tohtml import * -import utils +from . import utils import sys, os, time, string, glob, getopt def usage(): - print "\nDocMaker Usage information\n" - print " docmaker [options] file1 [file2 ...]\n" - print "using the following options:\n" - print " -h : print this page" - print " -t : set project title, as in '-t \"My Project\"'" - print " -o : set output directory, as in '-o mydir'" - print " -p : set documentation prefix, as in '-p ft2'" - print "" - print " --title : same as -t, as in '--title=\"My Project\"'" - print " --output : same as -o, as in '--output=mydir'" - print " --prefix : same as -p, as in '--prefix=ft2'" + print("\nDocMaker Usage information\n") + print(" docmaker [options] file1 [file2 ...]\n") + print("using the following options:\n") + print(" -h : print this page") + print(" -t : set project title, as in '-t \"My Project\"'") + print(" -o : set output directory, as in '-o mydir'") + print(" -p : set documentation prefix, as in '-p ft2'") + print() + print(" --title : same as -t, as in '--title=\"My Project\"'") + print(" --output : same as -o, as in '--output=mydir'") + print(" --prefix : same as -p, as in '--prefix=ft2'") def main( argv ): @@ -44,8 +44,8 @@ def main( argv ): global output_dir try: - opts, args = getopt.getopt( sys.argv[1:], \ - "ht:o:p:", \ + opts, args = getopt.getopt( sys.argv[1:], + "ht:o:p:", ["help", "title=", "output=", "prefix="] ) except getopt.GetoptError: usage() diff --git a/kiva/agg/freetype2/src/tools/docmaker/formatter.py b/kiva/agg/freetype2/src/tools/docmaker/formatter.py index f62ce676c..dcc06118c 100644 --- a/kiva/agg/freetype2/src/tools/docmaker/formatter.py +++ b/kiva/agg/freetype2/src/tools/docmaker/formatter.py @@ -1,9 +1,10 @@ # Formatter (c) 2002, 2004, 2007, 2008 David Turner # +import sys -from sources import * -from content import * -from utils import * +from .sources import * +from .content import * +from .utils import * # This is the base Formatter class. Its purpose is to convert # a content processor's data into specific documents (i.e., table of @@ -20,7 +21,7 @@ def __init__( self, processor ): self.processor = processor self.identifiers = {} self.chapters = processor.chapters - self.sections = processor.sections.values() + self.sections = list(processor.sections.values()) self.block_index = [] # store all blocks in a dictionary @@ -34,16 +35,15 @@ def __init__( self, processor ): if markup.tag == 'values': for field in markup.fields: self.add_identifier( field.name, block ) - - self.block_index = self.identifiers.keys() - self.block_index.sort( index_sort ) + # FIXME: This is bogus code, the intent is loosely respected but it never worked in 2.7 + self.block_index = sorted(self.identifiers.keys(), key=index_sort) def add_identifier( self, name, block ): - if self.identifiers.has_key( name ): + if name in self.identifiers: # duplicate name! - sys.stderr.write( \ - "WARNING: duplicate definition for '" + name + "' in " + \ - block.location() + ", previous definition in " + \ + sys.stderr.write( + "WARNING: duplicate definition for '" + name + "' in " + + block.location() + ", previous definition in " + self.identifiers[name].location() + "\n" ) else: self.identifiers[name] = block diff --git a/kiva/agg/freetype2/src/tools/docmaker/sources.py b/kiva/agg/freetype2/src/tools/docmaker/sources.py index 7b68c0701..9f67201c6 100644 --- a/kiva/agg/freetype2/src/tools/docmaker/sources.py +++ b/kiva/agg/freetype2/src/tools/docmaker/sources.py @@ -236,10 +236,10 @@ def location( self ): # debugging only - not used in normal operations def dump( self ): if self.content: - print "{{{content start---" + print("{{{content start---") for l in self.content: - print l - print "---content end}}}" + print(l) + print("---content end}}}") return fmt = "" @@ -247,7 +247,7 @@ def dump( self ): fmt = repr( self.format.id ) + " " for line in self.lines: - print line + print(line) diff --git a/kiva/agg/freetype2/src/tools/docmaker/tohtml.py b/kiva/agg/freetype2/src/tools/docmaker/tohtml.py index 1cbda755b..57adc5556 100644 --- a/kiva/agg/freetype2/src/tools/docmaker/tohtml.py +++ b/kiva/agg/freetype2/src/tools/docmaker/tohtml.py @@ -1,9 +1,10 @@ # ToHTML (c) 2002, 2003, 2005, 2006, 2007, 2008 # David Turner +from __future__ import print_function -from sources import * -from content import * -from formatter import * +from .sources import * +from .content import * +from .formatter import * import time @@ -169,29 +170,29 @@ # Translate a single line of source to HTML. This will convert # a "<" into "<.", ">" into ">.", etc. def html_quote( line ): - result = string.replace( line, "&", "&" ) - result = string.replace( result, "<", "<" ) - result = string.replace( result, ">", ">" ) + result = line.replace("&", "&" ) + result = result.replace("<", "<" ) + result = result.replace(">", ">" ) return result # same as 'html_quote', but ignores left and right brackets def html_quote0( line ): - return string.replace( line, "&", "&" ) + return line.replace("&", "&" ) def dump_html_code( lines, prefix = "" ): # clean the last empty lines l = len( self.lines ) - while l > 0 and string.strip( self.lines[l - 1] ) == "": + while l > 0 and self.lines[l - 1].strip() == "": l = l - 1 # The code footer should be directly appended to the last code # line to avoid an additional blank line. - print prefix + code_header, - for line in self.lines[0 : l + 1]: - print '\n' + prefix + html_quote( line ), - print prefix + code_footer, + print(prefix + code_header, end=" ") + for line in lines[0 : l + 1]: + print('\n' + prefix + html_quote( line ), end=" ") + print(prefix + code_footer, end=" ") @@ -296,7 +297,7 @@ def make_html_para( self, words ): r'\1‘\2’\3', \ line ) # convert tilde into non-breakable space - line = string.replace( line, "~", " " ) + line = line.replace("~", " " ) return para_header + line + para_footer @@ -317,19 +318,19 @@ def make_html_items( self, items ): else: lines.append( self.make_html_para( item.words ) ) - return string.join( lines, '\n' ) + return '\n'.join(lines) def print_html_items( self, items ): - print self.make_html_items( items ) + print(self.make_html_items( items )) def print_html_field( self, field ): if field.name: - print "
" + field.name + "" + print("
" + field.name + "") - print self.make_html_items( field.items ) + print(self.make_html_items( field.items )) if field.name: - print "
" + print("
") def html_source_quote( self, line, block_name = None ): result = "" @@ -346,7 +347,7 @@ def html_source_quote( self, line, block_name = None ): elif re_source_keywords.match( name ): # this is a C keyword result = result + prefix + keyword_prefix + name + keyword_suffix - elif self.identifiers.has_key( name ): + elif name in self.identifiers: # this is a known identifier block = self.identifiers[name] result = result + prefix + '

" - print "" + print("

") + print("
") for field in fields: if len( field.name ) > 22: - print "" - print "") + print("" - print "
" + field.name + "
" + print("
" + field.name + "
") else: - print "
" + field.name + "" + print("
" + field.name + "") self.print_html_items( field.items ) - print "
" + print("") + print("") def print_html_markup( self, markup ): table_fields = [] @@ -398,7 +399,7 @@ def print_html_markup( self, markup ): # Formatting the index # def index_enter( self ): - print self.html_index_header + print(self.html_index_header) self.index_items = {} def index_name_enter( self, name ): @@ -411,7 +412,7 @@ def index_exit( self ): count = len( self.block_index ) rows = ( count + self.columns - 1 ) / self.columns - print "" + print("
") for r in range( rows ): line = "" for c in range( self.columns ): @@ -423,15 +424,15 @@ def index_exit( self ): else: line = line + '' line = line + "" - print line + print(line) - print "
" + print("") - print index_footer_start + \ - self.file_prefix + "toc.html" + \ - index_footer_end + print(index_footer_start + + self.file_prefix + "toc.html" + + index_footer_end) - print self.html_footer + print(self.html_footer) self.index_items = {} @@ -445,38 +446,38 @@ def index_dump( self, index_filename = None ): # Formatting the table of content # def toc_enter( self ): - print self.html_toc_header - print "

Table of Contents

" + print(self.html_toc_header) + print("

Table of Contents

") def toc_chapter_enter( self, chapter ): - print chapter_header + string.join( chapter.title ) + chapter_inter - print "" + print(chapter_header + string.join( chapter.title ) + chapter_inter) + print("
") def toc_section_enter( self, section ): - print '" + print("") def toc_chapter_exit( self, chapter ): - print "
' - print '' + \ - section.title + '' + print('
') + print('' + + section.title + '') - print self.make_html_para( section.abstract ) + print(self.make_html_para( section.abstract )) def toc_section_exit( self, section ): - print "
" - print chapter_footer + print("") + print(chapter_footer) def toc_index( self, index_filename ): - print chapter_header + \ - 'Global Index' + \ - chapter_inter + chapter_footer + print(chapter_header + + 'Global Index' + + chapter_inter + chapter_footer) def toc_exit( self ): - print toc_footer_start + \ - self.file_prefix + "index.html" + \ - toc_footer_end + print(toc_footer_start + + self.file_prefix + "index.html" + + toc_footer_end) - print self.html_footer + print(self.html_footer) def toc_dump( self, toc_filename = None, index_filename = None ): if toc_filename == None: @@ -491,11 +492,11 @@ def toc_dump( self, toc_filename = None, index_filename = None ): # Formatting sections # def section_enter( self, section ): - print self.html_header + print(self.html_header) - print section_title_header - print section.title - print section_title_footer + print(section_title_header) + print(section.title) + print(section_title_footer) maxwidth = 0 for b in section.blocks.values(): @@ -503,10 +504,10 @@ def section_enter( self, section ): maxwidth = len( b.name ) width = 70 # XXX magic number - if maxwidth <> 0: + if maxwidth != 0: # print section synopsis - print section_synopsis_header - print "" + print(section_synopsis_header) + print("
") columns = width / maxwidth if columns < 1: @@ -526,21 +527,21 @@ def section_enter( self, section ): line = line + '' line = line + "" - print line + print(line) - print "


" - print section_synopsis_footer + print("

") + print(section_synopsis_footer) - print description_header - print self.make_html_items( section.description ) - print description_footer + print(description_header) + print(self.make_html_items( section.description )) + print(description_footer) def block_enter( self, block ): - print block_header + print(block_header) # place html anchor if needed if block.name: - print '

' + block.name + '

' + print('

' + block.name + '

') # dump the block C source lines now if block.code: @@ -548,43 +549,43 @@ def block_enter( self, block ): for f in self.headers.keys(): if block.source.filename.find( f ) >= 0: header = self.headers[f] + ' (' + f + ')' - break; + break # if not header: # sys.stderr.write( \ # 'WARNING: No header macro for ' + block.source.filename + '.\n' ) if header: - print header_location_header - print 'Defined in ' + header + '.' - print header_location_footer + print(header_location_header) + print('Defined in ' + header + '.') + print(header_location_footer) - print source_header + print(source_header) for l in block.code: - print self.html_source_quote( l, block.name ) - print source_footer + print(self.html_source_quote( l, block.name )) + print(source_footer) def markup_enter( self, markup, block ): if markup.tag == "description": - print description_header + print(description_header) else: - print marker_header + markup.tag + marker_inter + print(marker_header + markup.tag + marker_inter) self.print_html_markup( markup ) def markup_exit( self, markup, block ): if markup.tag == "description": - print description_footer + print(description_footer) else: - print marker_footer + print(marker_footer) def block_exit( self, block ): - print block_footer_start + self.file_prefix + "index.html" + \ - block_footer_middle + self.file_prefix + "toc.html" + \ - block_footer_end + print(block_footer_start + self.file_prefix + "index.html" + + block_footer_middle + self.file_prefix + "toc.html" + + block_footer_end) def section_exit( self, section ): - print html_footer + print(html_footer) def section_dump_all( self ): for section in self.sections: diff --git a/kiva/agg/freetype2/src/tools/docmaker/utils.py b/kiva/agg/freetype2/src/tools/docmaker/utils.py index 1d96658c7..f3adefb3a 100644 --- a/kiva/agg/freetype2/src/tools/docmaker/utils.py +++ b/kiva/agg/freetype2/src/tools/docmaker/utils.py @@ -3,6 +3,8 @@ import string, sys, os, glob +import six.moves as sm + # current output directory # output_dir = None @@ -20,8 +22,8 @@ def index_sort( s1, s2 ): l1 = len( s1 ) l2 = len( s2 ) - m1 = string.lower( s1 ) - m2 = string.lower( s2 ) + m1 = s1.lower() + m2 = s2.lower() for i in range( l1 ): if i >= l2 or m1[i] > m2[i]: @@ -83,7 +85,7 @@ def check_output(): if output_dir: if output_dir != "": if not os.path.isdir( output_dir ): - sys.stderr.write( "argument" + " '" + output_dir + "' " + \ + sys.stderr.write( "argument" + " '" + output_dir + "' " + "is not a valid directory" ) sys.exit( 2 ) else: @@ -112,7 +114,7 @@ def make_file_list( args = None ): args = sys.argv[1 :] for pathname in args: - if string.find( pathname, '*' ) >= 0: + if '*' in pathname: newpath = glob.glob( pathname ) newpath.sort() # sort files -- this is important because # of the order of files @@ -125,7 +127,7 @@ def make_file_list( args = None ): file_list = None else: # now filter the file list to remove non-existing ones - file_list = filter( file_exists, file_list ) + file_list = list(sm.filter( file_exists, file_list )) return file_list diff --git a/kiva/agg/freetype2/src/tools/glnames.py b/kiva/agg/freetype2/src/tools/glnames.py index 55573b22f..83b78ca25 100644 --- a/kiva/agg/freetype2/src/tools/glnames.py +++ b/kiva/agg/freetype2/src/tools/glnames.py @@ -29,7 +29,6 @@ import sys, string, struct, re, os.path - # This table lists the glyphs according to the Macintosh specification. # It is used by the TrueType Postscript names table. # @@ -4850,7 +4849,7 @@ def add( self, word, value ): letter = word[0] word = word[1:] - if self.children.has_key( letter ): + if letter in self.children: child = self.children[letter] else: child = StringNode( letter, 0 ) @@ -4860,7 +4859,8 @@ def add( self, word, value ): def optimize( self ): # optimize all children first - children = self.children.values() + # Create a copy + children = list(self.children.values()) self.children = {} for child in children: @@ -4908,8 +4908,7 @@ def locate( self, index ): if self.value != 0: index += 2 - children = self.children.values() - children.sort() + children = sorted(self.children.values()) index += 2 * len( children ) for child in children: @@ -4930,8 +4929,7 @@ def store( self, storage ): storage += struct.pack( "B", val ) # write the count - children = self.children.values() - children.sort() + children = sorted(self.children.values()) count = len( children ) @@ -5039,7 +5037,7 @@ def main(): """main program body""" if len( sys.argv ) != 2: - print __doc__ % sys.argv[0] + print(__doc__ % sys.argv[0]) sys.exit( 1 ) file = open( sys.argv[1], "w\n" ) diff --git a/kiva/agg/src/font_type.i b/kiva/agg/src/font_type.i index 45084dd9e..d662c13c5 100644 --- a/kiva/agg/src/font_type.i +++ b/kiva/agg/src/font_type.i @@ -60,6 +60,9 @@ namespace kiva %{ def unicode_safe_init(self, _name="Arial", _size=12, _family=0, _style=0, _encoding=0, validate=True): + ### HACK: C++ stuff expects a string (not unicode) for the face_name, so fix + ### if needed. + ### Only for python < 3 if '' == b'': if isinstance(_name, unicode): _name = _name.encode("latin1") diff --git a/kiva/agg/src/graphics_context.i b/kiva/agg/src/graphics_context.i index 2cbdeb452..0eaca6186 100644 --- a/kiva/agg/src/graphics_context.i +++ b/kiva/agg/src/graphics_context.i @@ -207,6 +207,7 @@ namespace kiva { %pythoncode %{ + import six # used in GraphicsContextArray constructors from numpy import array, zeros, uint8, fromstring, shape, ndarray, resize, dtype import numpy @@ -829,7 +830,7 @@ namespace kiva { if fmt.endswith("32"): pilformat = "RGBA" pixelformat = "rgba32" - if (isinstance(filename, basestring) and filename[-3:].lower() in FmtsWithoutAlpha) or \ + if (isinstance(filename, six.string_types) and filename[-3:].lower() in FmtsWithoutAlpha) or \ (file_format is not None and file_format.lower() in FmtsWithoutAlpha): pilformat = "RGB" pixelformat = "rgb24" diff --git a/kiva/agg/src/tst_convert.py b/kiva/agg/src/tst_convert.py index e4a67bb6c..d12497ff8 100644 --- a/kiva/agg/src/tst_convert.py +++ b/kiva/agg/src/tst_convert.py @@ -1,4 +1,6 @@ +from __future__ import print_function + import agg q=agg.Image((10,10),pix_format="rgb24") q.convert_pixel_format("rgba32") -print q.format() +print(q.format()) diff --git a/kiva/agg/tests/clip_to_rect_test_case.py b/kiva/agg/tests/clip_to_rect_test_case.py index 58696aa11..6efabdf35 100644 --- a/kiva/agg/tests/clip_to_rect_test_case.py +++ b/kiva/agg/tests/clip_to_rect_test_case.py @@ -25,7 +25,7 @@ from kiva.agg import GraphicsContextArray import kiva -from test_utils import Utils +from .test_utils import Utils class ClipToRectTestCase(unittest.TestCase, Utils): @@ -183,7 +183,7 @@ def test_clip_to_rect_rotated(self): gc = GraphicsContextArray((1,1), pix_format="rgb24") gc.rotate_ctm(1.0) - self.failUnlessRaises(NotImplementedError, + self.assertRaises(NotImplementedError, gc.clip_to_rect, 0, 0, 1, 1) #------------------------------------------------------------------------ diff --git a/kiva/agg/tests/compiled_path_test_case.py b/kiva/agg/tests/compiled_path_test_case.py index 1f58e05e8..8199141aa 100644 --- a/kiva/agg/tests/compiled_path_test_case.py +++ b/kiva/agg/tests/compiled_path_test_case.py @@ -4,7 +4,7 @@ from kiva import agg -from test_utils import Utils +from .test_utils import Utils # UNCOMMENT THIS TO SEE THE IMPORT ISSUES FROM TICKET # https://svn.enthought.com/enthought/ticket/537 (agg causes python crash during unit tests) diff --git a/kiva/agg/tests/font_loading_test.py b/kiva/agg/tests/font_loading_test.py index a8f3ae611..b8c6659ed 100644 --- a/kiva/agg/tests/font_loading_test.py +++ b/kiva/agg/tests/font_loading_test.py @@ -1,3 +1,5 @@ +from __future__ import print_function + from string import ascii_lowercase, ascii_uppercase import os import time @@ -22,9 +24,9 @@ def test(): dims = metrics.get_text_extent(s) allmetrics.append(metrics) end = time.time() - print "finished count=%d" % count - print " total time:", end - start - print " time/set_font:", (end-start) / float(count * len(fonts)) + print("finished count=%d" % count) + print(" total time:", end - start) + print(" time/set_font:", (end-start) / float(count * len(fonts))) if __name__ == "__main__": test() diff --git a/kiva/agg/tests/graphics_context_test_case.py b/kiva/agg/tests/graphics_context_test_case.py index fa5fbbafe..97285d697 100644 --- a/kiva/agg/tests/graphics_context_test_case.py +++ b/kiva/agg/tests/graphics_context_test_case.py @@ -17,12 +17,12 @@ def test_init_bmp_equal_to_clear_bmp(self): gc = agg.GraphicsContextArray((5,5)) gc2 = agg.GraphicsContextArray((5,5)) gc2.clear() - self.assert_((gc.bmp_array == gc2.bmp_array).all()) + self.assertTrue((gc.bmp_array == gc2.bmp_array).all()) def test_init_with_bmp_doesnt_clear(self): a = ones((5,5,4), dtype('uint8')) gc = agg.GraphicsContextArray(a, pix_format='rgba32') - self.assert_((gc.bmp_array == a).all()) + self.assertTrue((gc.bmp_array == a).all()) def test_save_restore_state(self): gc = agg.GraphicsContextArray((100,100)) @@ -70,14 +70,14 @@ def test_context_manager(self): with gc: # Change the values in the current context. gc.set_stroke_color((0,0,1,1)) - self.assert_(all(gc.get_stroke_color() == (0,0,1,1))) + self.assertTrue(all(gc.get_stroke_color() == (0,0,1,1))) gc.set_antialias(1) self.assertEqual(gc.get_antialias(), 1) gc.set_alpha(0.75) self.assertEqual(gc.get_alpha(), 0.75) # Verify that we are back to the previous settings. - self.assert_(all(gc.get_stroke_color() == (1,0,0,1))) + self.assertTrue(all(gc.get_stroke_color() == (1,0,0,1))) self.assertEqual(gc.get_antialias(), 0) self.assertEqual(gc.get_alpha(), 0.25) @@ -92,7 +92,7 @@ def test_context_manager_nested(self): with gc: # Change the values in the current context. gc.set_stroke_color((0,0,1,1)) - self.assert_(all(gc.get_stroke_color() == (0,0,1,1))) + self.assertTrue(all(gc.get_stroke_color() == (0,0,1,1))) gc.set_antialias(1) self.assertEqual(gc.get_antialias(), 1) gc.set_alpha(0.75) @@ -101,19 +101,19 @@ def test_context_manager_nested(self): with gc: # Change the values in the current context. gc.set_stroke_color((1,0,1,1)) - self.assert_(all(gc.get_stroke_color() == (1,0,1,1))) + self.assertTrue(all(gc.get_stroke_color() == (1,0,1,1))) gc.set_antialias(0) self.assertEqual(gc.get_antialias(), 0) gc.set_alpha(1.0) self.assertEqual(gc.get_alpha(), 1.0) # Verify that we are back to the previous settings. - self.assert_(all(gc.get_stroke_color() == (0,0,1,1))) + self.assertTrue(all(gc.get_stroke_color() == (0,0,1,1))) self.assertEqual(gc.get_antialias(), 1) self.assertEqual(gc.get_alpha(), 0.75) # Verify that we are back to the previous settings. - self.assert_(all(gc.get_stroke_color() == (1,0,0,1))) + self.assertTrue(all(gc.get_stroke_color() == (1,0,0,1))) self.assertEqual(gc.get_antialias(), 0) self.assertEqual(gc.get_alpha(), 0.25) @@ -165,7 +165,7 @@ def test_move_to(self): path = gc._get_path() actual, flag = path._vertex() desired = array((1.0, 1.0)) - self.assert_(allclose(actual, desired)) + self.assertTrue(allclose(actual, desired)) def test_move_to1(self): gc = agg.GraphicsContextArray((100, 100)) @@ -174,7 +174,7 @@ def test_move_to1(self): path = gc._get_path() actual, flag = path._vertex() desired = array((2.0, 2.0)) - self.assert_(allclose(actual, desired)) + self.assertTrue(allclose(actual, desired)) def test_quad_curve_to(self): gc = agg.GraphicsContextArray((100, 100)) @@ -228,7 +228,7 @@ def test_add_path(self): path2 = gc._get_path() desired = path1._vertices() actual = path2._vertices() - self.assert_(allclose(actual, desired)) + self.assertTrue(allclose(actual, desired)) desired = path1.get_ctm() actual = path2.get_ctm() @@ -248,7 +248,7 @@ def base_lines(self, lines): #print 'desired:', desired #print 'actual:', actual - self.assert_(allclose(actual,desired)) + self.assertTrue(allclose(actual,desired)) def test_lines_array(self): lines = array(((3.0,3.0), diff --git a/kiva/agg/tests/join_stroke_path_test_case.py b/kiva/agg/tests/join_stroke_path_test_case.py index e4f8812e7..4092bf8e8 100644 --- a/kiva/agg/tests/join_stroke_path_test_case.py +++ b/kiva/agg/tests/join_stroke_path_test_case.py @@ -27,7 +27,7 @@ from kiva.agg import GraphicsContextArray import kiva -from test_utils import Utils +from .test_utils import Utils class JoinStrokePathTestCase(unittest.TestCase, Utils): diff --git a/kiva/agg/tests/rgba_test_case.py b/kiva/agg/tests/rgba_test_case.py index f687d6916..462ee7bce 100644 --- a/kiva/agg/tests/rgba_test_case.py +++ b/kiva/agg/tests/rgba_test_case.py @@ -4,7 +4,7 @@ from kiva import agg -from test_utils import Utils +from .test_utils import Utils class RgbaTestCase(unittest.TestCase, Utils): diff --git a/kiva/agg/tests/stroke_path_test_case.py b/kiva/agg/tests/stroke_path_test_case.py index 07204a697..145b6bc91 100644 --- a/kiva/agg/tests/stroke_path_test_case.py +++ b/kiva/agg/tests/stroke_path_test_case.py @@ -54,7 +54,7 @@ from kiva.agg import GraphicsContextArray import kiva -from test_utils import Utils +from .test_utils import Utils class StrokePathTestCase(unittest.TestCase, Utils): diff --git a/kiva/agg/tests/test_utils.py b/kiva/agg/tests/test_utils.py index 82c7259c0..279a40a56 100644 --- a/kiva/agg/tests/test_utils.py +++ b/kiva/agg/tests/test_utils.py @@ -4,4 +4,4 @@ class Utils(object): def assertRavelEqual(self, x, y): - self.assert_(alltrue(ravel(x) == ravel(y)), "\n%s\n !=\n%s" % (x, y)) + self.assertTrue(alltrue(ravel(x) == ravel(y)), "\n%s\n !=\n%s" % (x, y)) diff --git a/kiva/agg/tests/unicode_font_test_case.py b/kiva/agg/tests/unicode_font_test_case.py index 0c131271e..47d95b91b 100644 --- a/kiva/agg/tests/unicode_font_test_case.py +++ b/kiva/agg/tests/unicode_font_test_case.py @@ -1,17 +1,24 @@ import unittest + +import six + from kiva.agg import AggFontType, GraphicsContextArray from kiva.fonttools import Font + class UnicodeTest(unittest.TestCase): def test_show_text_at_point(self): gc = GraphicsContextArray((100,100)) gc.set_font(Font()) - gc.show_text_at_point(unicode('asdf'), 5,5) + gc.show_text_at_point(six.text_type('asdf'), 5,5) def test_agg_font_type(self): - f = AggFontType(u"Arial") + f1 = AggFontType(u"Arial") + f2 = AggFontType(b"Arial") + self.assertEqual(f1, f2) + if __name__ == "__main__": unittest.main() diff --git a/kiva/basecore2d.py b/kiva/basecore2d.py index d1fe40d27..1d443457c 100644 --- a/kiva/basecore2d.py +++ b/kiva/basecore2d.py @@ -32,6 +32,8 @@ from __future__ import absolute_import, print_function +import six.moves as sm + import numpy as np from numpy import alltrue, array, asarray, float64, shape, pi, concatenate @@ -447,7 +449,7 @@ def begin_path(self): if self.path_transform_indices: tf = array(self.active_subpath, object)[self.path_transform_indices, :] - self.path_transform_indices = range(len(tf)) + self.path_transform_indices = list(sm.range(len(tf))) self.active_subpath = list(tf) else: self.active_subpath = [] @@ -512,7 +514,7 @@ def line_set(self, starts, ends): The current point is moved to the last point in 'ends'. """ self._new_subpath() - for i in xrange(min(len(starts), len(ends))): + for i in sm.range(min(len(starts), len(ends))): self.active_subpath.append((POINT, starts[i])) self.active_subpath.append((LINE, ends[i])) self.state.current_point = ends[i] diff --git a/kiva/cairo.py b/kiva/cairo.py index e99f49887..a93512c51 100644 --- a/kiva/cairo.py +++ b/kiva/cairo.py @@ -10,7 +10,8 @@ from __future__ import absolute_import import cairo import copy -from itertools import izip +import six.moves as sm + import numpy import warnings @@ -588,7 +589,7 @@ def line_set(self, starts, ends): N.B. Cairo cannot make disjointed lines as a single subpath, thus each line forms it's own subpath """ - for start, end in izip(starts, ends): + for start, end in sm.zip(starts, ends): self._ctx.move_to(*start) self._ctx.line_to(*end) @@ -1039,7 +1040,7 @@ def set_text_drawing_mode(self, mode): TEXT_INVISIBLE, TEXT_FILL_CLIP, TEXT_STROKE_CLIP, TEXT_FILL_STROKE_CLIP, TEXT_CLIP, TEXT_OUTLINE): msg = "Invalid text drawing mode. See documentation for valid modes" - raise ValueError, msg + raise ValueError(msg) self.state.text_drawing_mode = mode def set_text_position(self,x,y): @@ -1293,7 +1294,7 @@ def font_metrics_provider(): from chaco.api import ArrayPlotData, Plot, PlotGraphicsContext from chaco.example_support import COLOR_PALETTE - from itertools import cycle, izip + from itertools import cycle DPI = 72.0 dpi_scale = DPI / 72.0 @@ -1305,7 +1306,7 @@ def create_plot(): x = linspace(low, high, numpoints) pd = ArrayPlotData(index=x) p = Plot(pd, bgcolor="lightgray", padding=50, border_visible=True) - for t,i in izip(cycle(['line','scatter']),range(10)): + for t,i in sm.zip(cycle(['line','scatter']),sm.range(10)): pd.set_data("y" + str(i), jn(i,x)) p.plot(("index", "y" + str(i)), color=tuple(COLOR_PALETTE[i]), width = 2.0 * dpi_scale, type=t) diff --git a/kiva/fonttools/afm.py b/kiva/fonttools/afm.py index 6e85fc071..1e320423c 100644 --- a/kiva/fonttools/afm.py +++ b/kiva/fonttools/afm.py @@ -433,6 +433,6 @@ def get_angle(self): pathname = '/usr/local/share/fonts/afms/adobe' for fname in os.listdir(pathname): - fh = file(os.path.join(pathname, fname)) + fh = open(os.path.join(pathname, fname)) afm = AFM(fh) w, h = afm.string_width_height('John Hunter is the Man!') diff --git a/kiva/fonttools/font.py b/kiva/fonttools/font.py index 61676ca3a..42ea53096 100644 --- a/kiva/fonttools/font.py +++ b/kiva/fonttools/font.py @@ -5,6 +5,8 @@ from __future__ import absolute_import, print_function +import six + import copy from kiva.constants import (DEFAULT, DECORATIVE, ROMAN, SCRIPT, SWISS, MODERN, TELETYPE, NORMAL, ITALIC, BOLD, BOLD_ITALIC) @@ -82,13 +84,13 @@ def __init__(self, face_name="", size=12, family=SWISS, weight=NORMAL, style=NORMAL, underline=0, encoding=DEFAULT): if (type(size) != int) or (type(family) != type(SWISS)) or \ (type(weight) != type(NORMAL)) or (type(style) != type(NORMAL)) or \ - (type(underline) != int) or (not isinstance(face_name, basestring)) or \ + (type(underline) != int) or (not isinstance(face_name, six.string_types)) or \ (type(encoding) != type(DEFAULT)): raise RuntimeError("Bad value in Font() constructor.") ### HACK: C++ stuff expects a string (not unicode) for the face_name, so fix - ### if needed. See ticket #2111 in the CP Trac. + ### if needed. ### Only for python < 3 - if '' == b'' and isinstance(face_name, unicode): + if six.PY2 and isinstance(face_name, six.text_type): face_name = face_name.encode("latin1") self.size = size self.family = family diff --git a/kiva/fonttools/font_manager.py b/kiva/fonttools/font_manager.py index 3b89e420c..e0aa18599 100644 --- a/kiva/fonttools/font_manager.py +++ b/kiva/fonttools/font_manager.py @@ -56,7 +56,8 @@ import tempfile import errno -from six.moves import cPickle as pickle +import six +import six.moves as sm from fontTools.ttLib import TTFont, TTLibError from traits.etsconfig.api import ETSConfig @@ -181,7 +182,7 @@ def _is_writable_dir(p): p is a string pointing to a putative writable dir -- return True p is such a string, else False """ - if not isinstance(p, basestring): + if not isinstance(p, six.string_types): return False try: @@ -203,7 +204,7 @@ def get_configdir(): p = os.path.join(ETSConfig.application_data, 'kiva') try: os.makedirs(p) - except OSError, e: + except OSError as e: if e.errno != errno.EEXIST: raise if not _is_writable_dir(p): @@ -215,7 +216,7 @@ def is_string_like(obj): 'Return True if *obj* looks like a string' from numpy import ma - if isinstance(obj, basestring): + if isinstance(obj, six.string_types): return True # numpy strings are subclass of str, ma strings are not if ma.isMaskedArray(obj): @@ -311,7 +312,7 @@ def win32InstalledFonts(directory=None, fontext='ttf'): files.extend(glob.glob(os.path.join(directory, '*.'+ext))) return files try: - for j in range(winreg.QueryInfoKey(local)[1]): + for j in sm.range(winreg.QueryInfoKey(local)[1]): try: key, direc, any = winreg.EnumValue(local, j) if not os.path.dirname(direc): @@ -324,7 +325,7 @@ def win32InstalledFonts(directory=None, fontext='ttf'): except WindowsError: continue - return items.keys() + return list(items.keys()) finally: winreg.CloseKey(local) return None @@ -453,7 +454,7 @@ def findSystemFonts(fontpaths=None, fontext='ttf'): for f in get_fontconfig_fonts(fontext): fontfiles[f] = 1 - elif isinstance(fontpaths, (str, unicode)): + elif isinstance(fontpaths, six.string_types): fontpaths = [fontpaths] for path in fontpaths: @@ -523,7 +524,7 @@ def ttfFontProperty(fpath, font): *font* is a :class:`FT2Font` instance. """ props = getPropDict(font) - name = props[(1, 0, 0, 1)] + name = props[(1, 0, 0, 1)].decode() # Styles are: italic, oblique, and normal (default) @@ -536,11 +537,11 @@ def ttfFontProperty(fpath, font): except: sfnt4 = None if sfnt2: - sfnt2 = sfnt2.lower() + sfnt2 = sfnt2.lower().decode() else: sfnt2 = '' if sfnt4: - sfnt4 = sfnt4.lower() + sfnt4 = sfnt4.lower().decode() else: sfnt4 = '' if sfnt4.find('oblique') >= 0: @@ -673,7 +674,7 @@ def createFontList(fontfiles, fontext='ttf'): a list of TrueType fonts. An AFM font list can optionally be created. """ - + # FIXME: This function is particularly difficult to debug fontlist = [] # Add fonts from list of known font files. seen = {} @@ -834,7 +835,7 @@ def get_name(self): """ filename = str(fontManager.findfont(self)) if filename.endswith('.afm'): - return afm.AFM(file(filename)).get_familyname() + return afm.AFM(open(filename)).get_familyname() font = fontManager.findfont(self) return getPropDict(TTFont(str(font)))[(1, 0, 0, 1)] @@ -1010,7 +1011,7 @@ def pickle_dump(data, filename): """ fh = open(filename, 'wb') try: - pickle.dump(data, fh) + sm.cPickle.dump(data, fh) finally: fh.close() @@ -1022,7 +1023,7 @@ def pickle_load(filename): """ fh = open(filename, 'rb') try: - data = pickle.load(fh) + data = sm.cPickle.load(fh) finally: fh.close() return data diff --git a/kiva/fonttools/sstruct.py b/kiva/fonttools/sstruct.py index 335d9464e..e703e96e8 100644 --- a/kiva/fonttools/sstruct.py +++ b/kiva/fonttools/sstruct.py @@ -77,7 +77,7 @@ def pack(format, obj): # fixed point conversion value = int(round(value*fixes[name])) elements.append(value) - data = apply(struct.pack, (formatstring,) + tuple(elements)) + data = struct.pack(formatstring, *elements) return data diff --git a/kiva/image.py b/kiva/image.py index 0cdee85fe..4f605a74f 100644 --- a/kiva/image.py +++ b/kiva/image.py @@ -18,20 +18,20 @@ # Soon the Agg subpackage will be renamed for real. For now, just # proxy the imports. -from agg import GraphicsContextArray as GraphicsContext +from .agg import GraphicsContextArray as GraphicsContext # FontType will be unified with the Kiva FontType soon. -from agg import AggFontType as FontType +from .agg import AggFontType as FontType # GraphicsContextSystem wraps up platform- and toolkit- specific low # level calls with a GraphicsContextArray. Eventually this low-level code # will be moved out of the Agg subpackage, and we won't have be importing # this here. -from agg import GraphicsContextSystem, Image +from .agg import GraphicsContextSystem, Image # CompiledPath is an object that can efficiently store paths to be reused # multiple times. -from agg import CompiledPath +from .agg import CompiledPath def font_metrics_provider(): """ Create an object to be used for querying font metrics. diff --git a/kiva/pdf.py b/kiva/pdf.py index 7a3db5c78..034808663 100644 --- a/kiva/pdf.py +++ b/kiva/pdf.py @@ -20,7 +20,7 @@ from __future__ import absolute_import, print_function # standard library imports -from itertools import izip +import six.moves as sm import warnings import copy from numpy import array, pi @@ -343,7 +343,7 @@ def line_set(self, starts, ends): if self.current_pdf_path is None: self.begin_path() - for start, end in izip(starts, ends): + for start, end in sm.zip(starts, ends): self.current_pdf_path.moveTo(start[0], start[1]) self.current_pdf_path.lineTo(end[0], end[1]) self.current_point = (end[0], end[1]) diff --git a/kiva/pdfmetrics.py b/kiva/pdfmetrics.py index cc0f2cad7..2ac2abf52 100644 --- a/kiva/pdfmetrics.py +++ b/kiva/pdfmetrics.py @@ -14,6 +14,7 @@ #copyright ReportLab Inc. 2001 #see license.txt for license details #history http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/reportlab/pdfbase/pdfmetrics.py?cvsroot=reportlab +from __future__ import print_function # MODIFIED from reportlab's version for the sake of easier integration in Kiva -- David Ascher @@ -36,10 +37,15 @@ trap attempts to access them and do it on first access. """ import string, os +import warnings + +import six +import six.moves as sm # XXX Kiva specific changes defaultEncoding = 'WinAnsiEncoding' # 'WinAnsi' or 'MacRoman' -import _fontdata + +from . import _fontdata standardFonts = _fontdata.standardFonts standardEncodings = _fontdata.standardEncodings @@ -65,41 +71,42 @@ def parseAFMFile(afmFileName): needed for embedding. A better parser would accept options for what data you wwanted, and preserve the order.""" - - lines = open(afmFileName, 'r').readlines() - if len(lines)<=1: + with open(afmFileName, 'r') as f: + lines = f.readlines() + if len(lines) < 1: + raise ValueError('AFM file %s is empty' % afmFileName) + if len(lines) == 1: #likely to be a MAC file - lines = string.split(lines,'\r') - if len(lines)<=1: - raise ValueError, 'AFM file %s hasn\'t enough data' % afmFileName + lines = lines[0].split('\r') + if len(lines) <= 1: + raise ValueError('AFM file %s hasn\'t enough data' % afmFileName) topLevel = {} glyphLevel = [] - lines = map(string.strip, lines) #pass 1 - get the widths inMetrics = 0 # os 'TOP', or 'CHARMETRICS' for line in lines: + line = line.strip() if line[0:16] == 'StartCharMetrics': inMetrics = 1 elif line[0:14] == 'EndCharMetrics': inMetrics = 0 elif inMetrics: - chunks = string.split(line, ';') - chunks = map(string.strip, chunks) + chunks = [x.strip() for x in line.split(';')] cidChunk, widthChunk, nameChunk = chunks[0:3] # character ID - l, r = string.split(cidChunk) + l, r = cidChunk.split() assert l == 'C', 'bad line in font file %s' % line - cid = string.atoi(r) + cid = int(r) # width - l, r = string.split(widthChunk) + l, r = widthChunk.split() assert l == 'WX', 'bad line in font file %s' % line - width = string.atoi(r) + width = int(r) # name - l, r = string.split(nameChunk) + l, r = nameChunk.split() assert l == 'N', 'bad line in font file %s' % line name = r @@ -115,11 +122,11 @@ def parseAFMFile(afmFileName): elif inHeader: if line[0:7] == 'Comment': pass try: - left, right = string.split(line,' ',1) + left, right = line.split(' ',1) except: - raise ValueError, "Header information error in afm %s: line='%s'" % (afmFileName, line) + raise ValueError("Header information error in afm %s: line='%s'" % (afmFileName, line)) try: - right = string.atoi(right) + right = int(right) except: pass topLevel[left] = right @@ -152,11 +159,11 @@ def _loadBuiltInData(self, name): We presume they never change so this can be a shared reference.""" self.glyphWidths = _fontdata.widthsByFontGlyph[name] - self.glyphNames = self.glyphWidths.keys() + self.glyphNames = list(self.glyphWidths.keys()) self.ascent,self.descent = _fontdata.ascent_descent[name] def findT1File(self, ext='.pfb'): - possible_exts = (string.lower(ext), string.upper(ext)) + possible_exts = (ext.lower(), ext.upper()) if hasattr(self,'pfbFileName'): r_basename = os.path.splitext(self.pfbFileName)[0] for e in possible_exts: @@ -167,19 +174,19 @@ def findT1File(self, ext='.pfb'): except: afm = bruteForceSearchForAFM(self.name) if afm: - if string.lower(ext) == '.pfb': + if ext.lower() == '.pfb': for e in possible_exts: pfb = os.path.splitext(afm)[0] + e if os.path.isfile(pfb): r = pfb else: r = None - elif string.lower(ext) == '.afm': + elif ext.lower() == '.afm': r = afm else: r = None if r is None: - warnOnce("Can't find %s for face '%s'" % (ext, self.name)) + warnings.warn("Can't find %s for face '%s'" % (ext, self.name)) return r def bruteForceSearchForAFM(faceName): @@ -219,7 +226,7 @@ def __init__(self, name, base=None): # assume based on the usual one self.baseEncodingName = defaultEncoding self.vector = _fontdata.encodings[defaultEncoding] - elif isinstance(base, basestring): + elif isinstance(base, six.string_types): baseEnc = getEncoding(base) self.baseEncodingName = baseEnc.name self.vector = baseEnc.vector[:] @@ -249,7 +256,7 @@ def freeze(self): self.frozen = 1 def isEqual(self, other): - return ((enc.name == other.name) and (enc.vector == other.vector)) + return ((self.name == other.name) and (self.vector == other.vector)) def modifyRange(self, base, newNames): """Sets a group of character names starting at the code point 'base'.""" @@ -272,7 +279,7 @@ def getDifferences(self, otherEnc): ranges = [] curRange = None - for i in xrange(len(self.vector)): + for i in sm.range(len(self.vector)): glyph = self.vector[i] if glyph==otherEnc.vector[i]: if curRange: @@ -326,7 +333,7 @@ def _calcWidths(self): w[i] = width except KeyError: # XXX Kiva specific change - print 'typeface "%s" does not have a glyph "%s", bad font!' % (self.face.name, glyphName) + print('typeface "%s" does not have a glyph "%s", bad font!' % (self.face.name, glyphName)) self.widths = w if not _stringWidth: @@ -365,13 +372,13 @@ def _pfbSegLen(p,d): def _pfbCheck(p,d,m,fn): if d[p]!=PFB_MARKER or d[p+1]!=m: - raise ValueError, 'Bad pfb file\'%s\' expected chr(%d)chr(%d) at char %d, got chr(%d)chr(%d)' % (fn,ord(PFB_MARKER),ord(m),p,ord(d[p]),ord(d[p+1])) + raise ValueError('Bad pfb file\'%s\' expected chr(%d)chr(%d) at char %d, got chr(%d)chr(%d)' % (fn,ord(PFB_MARKER),ord(m),p,ord(d[p]),ord(d[p+1]))) if m==PFB_EOF: return p = p + 2 l = _pfbSegLen(p,d) p = p + 4 if p+l>len(d): - raise ValueError, 'Bad pfb file\'%s\' needed %d+%d bytes have only %d!' % (fn,p,l,len(d)) + raise ValueError('Bad pfb file\'%s\' needed %d+%d bytes have only %d!' % (fn,p,l,len(d))) return p, p+l @@ -418,18 +425,17 @@ def _loadMetrics(self, afmFileName): self.stemV = topLevel.get('stemV', 0) self.xHeight = topLevel.get('XHeight', 1000) - strBbox = topLevel.get('FontBBox', [0,0,1000,1000]) - tokens = string.split(strBbox) - self.bbox = [] - for tok in tokens: - self.bbox.append(string.atoi(tok)) + try: + strBbox = topLevel['FontBBox'] + self.bbox = [int(tok) for tok in strBbox.split()] + except KeyError: + self.bbox = [0,0,1000,1000] glyphWidths = {} for (cid, width, name) in glyphData: glyphWidths[name] = width self.glyphWidths = glyphWidths - self.glyphNames = glyphWidths.keys() - self.glyphNames.sort() + self.glyphNames = sorted(glyphWidths.keys()) # for font-specific encodings like Symbol, Dingbats, Carta we # need to make a new encoding as well.... @@ -454,7 +460,7 @@ def registerTypeFace(face): def registerEncoding(enc): assert isinstance(enc, Encoding), 'Not an Encoding: %s' % enc - if _encodings.has_key(enc.name): + if enc.name in _encodings: # already got one, complain if they are not the same if enc.isEqual(_encodings[enc.name]): enc.freeze() @@ -467,12 +473,13 @@ def registerEncoding(enc): def registerFont(font): "Registers a font, including setting up info for accelerated stringWidth" + # FIXME: This doesn't work #assert isinstance(font, Font), 'Not a Font: %s' % font fontName = font.fontName _fonts[fontName] = font if not font._multiByte: if _stringWidth: - _rl_accel.setFontInfo(string.lower(fontName), + _rl_accel.setFontInfo(fontName.lower(), _dummyEncoding, font.face.ascent, font.face.descent, @@ -555,27 +562,24 @@ def _slowStringWidth(text, fontName, fontSize): stringWidth = _slowStringWidth def dumpFontData(): - print 'Registered Encodings:' - keys = _encodings.keys() - keys.sort() + print('Registered Encodings:') + keys = sorted(_encodings.keys()) for encName in keys: - print ' ',encName + print(' ',encName) - print - print 'Registered Typefaces:' - faces = _typefaces.keys() - faces.sort() + print() + print('Registered Typefaces:') + faces = sorted(_typefaces.keys()) for faceName in faces: - print ' ',faceName + print(' ', faceName) - print - print 'Registered Fonts:' - k = _fonts.keys() - k.sort() + print() + print('Registered Fonts:') + k = sorted(_fonts.keys()) for key in k: font = _fonts[key] - print ' %s (%s/%s)' % (font.fontName, font.face.name, font.encoding.name) + print(' %s (%s/%s)' % (font.fontName, font.face.name, font.encoding.name)) @@ -587,7 +591,7 @@ def test3widths(texts): for text in texts: l1 = _stringWidth(text, fontName, 10) t1 = time.time() - print 'fast stringWidth took %0.4f' % (t1 - t0) + print('fast stringWidth took %0.4f' % (t1 - t0)) t0 = time.time() w = getFont(fontName).widths @@ -596,33 +600,33 @@ def test3widths(texts): for ch in text: l2 = l2 + w[ord(ch)] t1 = time.time() - print 'slow stringWidth took %0.4f' % (t1 - t0) + print('slow stringWidth took %0.4f' % (t1 - t0)) t0 = time.time() for text in texts: l3 = getFont(fontName).stringWidth(text, 10) t1 = time.time() - print 'class lookup and stringWidth took %0.4f' % (t1 - t0) - print + print('class lookup and stringWidth took %0.4f' % (t1 - t0)) + print() def testStringWidthAlgorithms(): rawdata = open('../../rlextra/rml2pdf/doc/rml_user_guide.prep').read() - print 'rawdata length %d' % len(rawdata) - print 'test one huge string...' + print('rawdata length %d' % len(rawdata)) + print('test one huge string...') test3widths([rawdata]) - print - words = string.split(rawdata) - print 'test %d shorter strings (average length %0.2f chars)...' % (len(words), 1.0*len(rawdata)/len(words)) + print() + words = rawdata.split() + print('test %d shorter strings (average length %0.2f chars)...' % (len(words), 1.0*len(rawdata)/len(words))) test3widths(words) def test(): helv = TypeFace('Helvetica') registerTypeFace(helv) - print helv.glyphNames[0:30] + print(helv.glyphNames[0:30]) wombat = TypeFace('Wombat') - print wombat.glyphNames + print(wombat.glyphNames) registerTypeFace(wombat) dumpFontData() diff --git a/kiva/ps.py b/kiva/ps.py index 154027731..35c37e671 100644 --- a/kiva/ps.py +++ b/kiva/ps.py @@ -15,20 +15,35 @@ :Author: David Ascher (davida@activestate.com) :Version: $Revision: 1.2 $ """ +from __future__ import print_function # Major library imports import os import sys -from six import StringIO -from numpy import arange, ravel, array import warnings +import six + +from numpy import arange, ravel, array + + # Local, relative Kiva imports -import affine -import basecore2d -import constants -from constants import * -import agg +from . import affine +from . import basecore2d +from . import constants +from .constants import ( + FILL_STROKE, + EOF_FILL_STROKE, + FILL, + STROKE, + EOF_FILL, + LOAD_CTM, + CONCAT_CTM, + SCALE_CTM, + ROTATE_CTM, + TRANSLATE_CTM +) +from . import agg # This backend does not have compiled paths, yet. CompiledPath = None @@ -47,19 +62,19 @@ except ImportError: class FakeLogger: def debug(self, message): - print >> sys.stderr, "DEBUG:", message + print("DEBUG:", message, file=sys.stderr) def info(self, message): - print >> sys.stderr, "INFO:", message + print("INFO:", message, file=sys.stderr) def warn(self, message): - print >> sys.stderr, "WARN:", message + print("WARN:", message, file=sys.stderr) def error(self, message): - print >> sys.stderr, "ERROR:", message + print("ERROR:", message, file=sys.stderr) def critical(self, message): - print >> sys.stderr, "CRITICAL:", message + print("CRITICAL:", message, file=sys.stderr) log = FakeLogger() def _strpoints(points): - c = StringIO() + c = six.StringIO() for x,y in points: c.write('%3.2f,%3.2f ' % (x,y)) return c.getvalue() @@ -90,10 +105,6 @@ def default_filter(kw1): constants.JOIN_BEVEL: 2, } -font_map = {'Arial': 'Helvetica'} - -import _fontdata - font_map = {'Arial': 'Helvetica'} try: # reportlab supports more fonts @@ -102,8 +113,8 @@ def default_filter(kw1): _reportlab_loaded = 1 except ImportError: # we support the basic 14 - import pdfmetrics - import _fontdata + from . import _fontdata + from . import pdfmetrics _reportlab_loaded = 0 font_face_map = {'Arial': 'Helvetica', '': 'Helvetica'} @@ -124,12 +135,12 @@ def __init__(self, size, *args, **kwargs): super(PSGC, self).__init__(size, *args, **kwargs) self.size = size self._height = size[1] - self.contents = StringIO() + self.contents = six.StringIO() self._clipmap = {} self.clip_id = None def clear(self): - self.contents = StringIO() + self.contents = six.StringIO() def width(self): return self.size[0] @@ -148,7 +159,7 @@ def save(self, filename): f.write("%!PS-Adobe-2.0\n") f.write(self.contents.getvalue()) else: - raise ValueError, "don't know how to write a %s file" % ext + raise ValueError("don't know how to write a %s file" % ext) # Text handling code @@ -199,7 +210,7 @@ def device_draw_image(self, img, rect): Requires the Python Imaging Library (PIL). """ - from kiva.compat import pilfromstring, piltostring + from kiva.compat import pilfromstring, piltostring, Image as PilImage if type(img) == type(array([])): # Numeric array diff --git a/kiva/qpainter.py b/kiva/qpainter.py index 8ec812d97..2d0c2347c 100644 --- a/kiva/qpainter.py +++ b/kiva/qpainter.py @@ -13,7 +13,7 @@ from __future__ import absolute_import, print_function from functools import partial -from itertools import izip +import six.moves as sm import numpy as np import warnings @@ -342,7 +342,7 @@ def lines(self, points): def line_set(self, starts, ends): """ Draw multiple disjoint line segments. """ - for start, end in izip(starts, ends): + for start, end in sm.zip(starts, ends): self.path.path.moveTo(start[0], start[1]) self.path.path.lineTo(end[0], end[1]) diff --git a/kiva/quartz/ABCGI.pyx b/kiva/quartz/ABCGI.pyx index 016cdf39d..09051286b 100644 --- a/kiva/quartz/ABCGI.pyx +++ b/kiva/quartz/ABCGI.pyx @@ -1,7 +1,7 @@ # :Author: Robert Kern # :Copyright: 2004, 2007, Enthought, Inc. # :License: BSD Style - +from __future__ import print_function include "Python.pxi" include "CoreFoundation.pxi" @@ -2619,28 +2619,28 @@ cdef class PiecewiseLinearColorFunction(ShadingFunction): def dump(self): cdef int i - print 'PiecewiseLinearColorFunction' - print ' num_stops = %i' % self.num_stops - print ' stops = ', + print('PiecewiseLinearColorFunction') + print(' num_stops = %i' % self.num_stops) + print(' stops = ', end=" ") for i from 0 <= i < self.num_stops: - print self.stops[i], - print - print ' red = ', + print(self.stops[i], end=" ") + print() + print(' red = ', end=" ") for i from 0 <= i < self.num_stops: - print self.red[i], - print - print ' green = ', + print(self.red[i], end=" ") + print() + print(' green = ', end=" ") for i from 0 <= i < self.num_stops: - print self.green[i], - print - print ' blue = ', + print(self.green[i], end=" ") + print() + print(' blue = ', end=" ") for i from 0 <= i < self.num_stops: - print self.blue[i], - print - print ' alpha = ', + print(self.blue[i], end=" ") + print() + print(' alpha = ', end=" ") for i from 0 <= i < self.num_stops: - print self.alpha[i], - print + print(self.alpha[i], end=" ") + print() def __dealloc__(self): safe_free(self.stops) diff --git a/kiva/quartz/CTFont.pyx b/kiva/quartz/CTFont.pyx index 3071ba142..43cb8450b 100644 --- a/kiva/quartz/CTFont.pyx +++ b/kiva/quartz/CTFont.pyx @@ -1,7 +1,7 @@ # :Author: John Wiggins # :Copyright: 2011, Enthought, Inc. # :License: BSD Style - +from __future__ import print_function include "CoreFoundation.pxi" include "CoreGraphics.pxi" @@ -183,7 +183,7 @@ cdef class FontLookup: def list_fonts(self): for name in self.names(): - print name, self.styles(name) + print(name, self.styles(name)) default_font_info = FontLookup() default_font_info.default_font = 'Helvetica' diff --git a/kiva/quartz/setup.py b/kiva/quartz/setup.py index 313f6b040..c8f9a7f59 100644 --- a/kiva/quartz/setup.py +++ b/kiva/quartz/setup.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import print_function import os import platform diff --git a/kiva/svg.py b/kiva/svg.py index f155e6881..484c70781 100644 --- a/kiva/svg.py +++ b/kiva/svg.py @@ -37,20 +37,27 @@ # Major library imports import os import sys -from six import StringIO from numpy import arange, ravel, array import warnings +import six + # Local, relative Kiva imports -import affine -import basecore2d -import constants -from constants import FILL, FILL_STROKE, EOF_FILL_STROKE, EOF_FILL, STROKE -import agg +from . import affine +from . import basecore2d +from . import constants +from .constants import ( + FILL, + FILL_STROKE, + EOF_FILL_STROKE, + EOF_FILL, + STROKE +) +from . import agg from base64 import b64encode def _strpoints(points): - c = StringIO() + c = six.StringIO() for x,y in points: c.write('%3.2f,%3.2f ' % (x,y)) return c.getvalue() @@ -81,10 +88,6 @@ def default_filter(kw1): constants.JOIN_MITER: 'miter' } -font_map = {'Arial': 'Helvetica', - } -import _fontdata - xmltemplate = """ @@ -126,8 +129,8 @@ def default_filter(kw1): import reportlab.pdfbase._fontdata as _fontdata _reportlab_loaded = 1 except ImportError: - import pdfmetrics - import _fontdata + from . import pdfmetrics + from . import _fontdata _reportlab_loaded = 0 font_face_map = {'Arial': 'Helvetica', '': 'Helvetica'} @@ -143,7 +146,7 @@ def __init__(self, size, *args, **kwargs): super(GraphicsContext, self).__init__(self, size, *args, **kwargs) self.size = size self._height = size[1] - self.contents = StringIO() + self.contents = six.StringIO() self._clipmap = {} def render(self, format): @@ -153,7 +156,7 @@ def render(self, format): return xmltemplate % locals() def clear(self): - self.contents = StringIO() + self.contents = six.StringIO() def width(self): return self.size[0] @@ -173,7 +176,7 @@ def save(self, filename): contents = self.contents.getvalue() template = htmltemplate else: - raise ValueError, "don't know how to write a %s file" % ext + raise ValueError("don't know how to write a %s file" % ext) f.write(template % locals()) @@ -262,7 +265,7 @@ def device_draw_image(self, img, rect): # This is not strictly required. pil_img = pil_img.resize((int(width), int(height)), PilImage.NEAREST) - png_buffer = StringIO() + png_buffer = six.StringIO() pil_img.save(png_buffer, 'png') b64_img_data = b64encode(png_buffer.getvalue()) png_buffer.close() diff --git a/kiva/tests/agg/image_test_case.py b/kiva/tests/agg/image_test_case.py index 04d3946f1..a202c9b87 100644 --- a/kiva/tests/agg/image_test_case.py +++ b/kiva/tests/agg/image_test_case.py @@ -1,7 +1,11 @@ +from __future__ import print_function + from timeit import Timer import os, sys import unittest +import six + from PIL import Image from numpy import alltrue, array, concatenate, dtype, fromstring, newaxis, \ pi, ravel, ones, zeros @@ -139,6 +143,8 @@ def test_rotate(self): gc.show_text(text) save(gc,test_name()+'.bmp') + +@unittest.skipIf(six.PY3, reason="Crashes on python 3. See GH #95.") class test_sun(unittest.TestCase): def generic_sun(self,scheme): img = sun(scheme) diff --git a/kiva/tests/agg/test_image3.py b/kiva/tests/agg/test_image3.py index 65febdad3..4e583562c 100644 --- a/kiva/tests/agg/test_image3.py +++ b/kiva/tests/agg/test_image3.py @@ -1,4 +1,4 @@ - +from __future__ import print_function import os import time diff --git a/kiva/tests/basecore2d_test_case.py b/kiva/tests/basecore2d_test_case.py index af4f948af..5c9862394 100644 --- a/kiva/tests/basecore2d_test_case.py +++ b/kiva/tests/basecore2d_test_case.py @@ -22,19 +22,19 @@ class TestIsFullyTransparent(unittest.TestCase): def test_simple(self): - self.assert_(basecore2d.is_fully_transparent([1, 1, 1, 0])) - self.assert_(not basecore2d.is_fully_transparent([0, 0, 0, 1])) - self.assert_(not basecore2d.is_fully_transparent([0, 0, 0, .5])) + self.assertTrue(basecore2d.is_fully_transparent([1, 1, 1, 0])) + self.assertTrue(not basecore2d.is_fully_transparent([0, 0, 0, 1])) + self.assertTrue(not basecore2d.is_fully_transparent([0, 0, 0, .5])) class TestFillEqual(unittest.TestCase): def test_simple(self): - self.assert_(basecore2d.fill_equal(array([0, 0, 0, 0]), + self.assertTrue(basecore2d.fill_equal(array([0, 0, 0, 0]), array([0, 0, 0, 0]))) - self.assert_(not basecore2d.fill_equal(array([0, 0, 0, 0]), + self.assertTrue(not basecore2d.fill_equal(array([0, 0, 0, 0]), array([0, 0, 0, 1]))) - self.assert_(not basecore2d.fill_equal(array([0, 0, 0, 0]), + self.assertTrue(not basecore2d.fill_equal(array([0, 0, 0, 0]), array([1, 0, 0, 0]))) @@ -63,24 +63,24 @@ def test_color_on_copy(self): ls1 = self.create_ls() ls2 = ls1.copy() ls1.line_color[1] = 10 - self.assert_(not basecore2d.line_state_equal(ls1, ls2)) + self.assertTrue(not basecore2d.line_state_equal(ls1, ls2)) def test_dash_on_copy(self): ls1 = self.create_ls() ls2 = ls1.copy() ls1.line_dash[1][0] = 10 - self.assert_(not basecore2d.line_state_equal(ls1, ls2)) + self.assertTrue(not basecore2d.line_state_equal(ls1, ls2)) def test_cmp_for_different_length_dash_patterns(self): ls1 = self.create_ls() ls2 = ls1.copy() ls1.line_dash = (ls1.line_dash[0], array([10, 10, 10, 10])) - self.assert_(not basecore2d.line_state_equal(ls1, ls2)) + self.assertTrue(not basecore2d.line_state_equal(ls1, ls2)) def test_cmp(self): ls1 = self.create_ls() ls2 = ls1.copy() - self.assert_(basecore2d.line_state_equal(ls1, ls2)) + self.assertTrue(basecore2d.line_state_equal(ls1, ls2)) #line_dash no longer allowed to be none. #def test_cmp_with_dash_as_none(self): @@ -104,7 +104,7 @@ def test_get_ctm(self): # default ctm should be identity matrix. desired = affine.affine_identity() actual = gc.get_ctm() - self.assert_(alltrue(ravel(actual == desired))) + self.assertTrue(alltrue(ravel(actual == desired))) def test_scale_ctm(self): gc = basecore2d.GraphicsContextBase() @@ -113,7 +113,7 @@ def test_scale_ctm(self): desired = affine.scale(ident, sx, sy) gc.scale_ctm(sx, sy) actual = gc.get_ctm() - self.assert_(alltrue(ravel(actual == desired))) + self.assertTrue(alltrue(ravel(actual == desired))) def test_rotate_ctm(self): gc = basecore2d.GraphicsContextBase() @@ -122,7 +122,7 @@ def test_rotate_ctm(self): desired = affine.rotate(ident, angle) gc.rotate_ctm(angle) actual = gc.get_ctm() - self.assert_(alltrue(ravel(actual == desired))) + self.assertTrue(alltrue(ravel(actual == desired))) def test_translate_ctm(self): gc = basecore2d.GraphicsContextBase() @@ -131,7 +131,7 @@ def test_translate_ctm(self): desired = affine.translate(ident, x, y) gc.translate_ctm(x, y) actual = gc.get_ctm() - self.assert_(alltrue(ravel(actual == desired))) + self.assertTrue(alltrue(ravel(actual == desired))) def test_concat_ctm(self): gc = basecore2d.GraphicsContextBase() @@ -141,7 +141,7 @@ def test_concat_ctm(self): desired = affine.concat(ident, trans) gc.concat_ctm(trans) actual = gc.get_ctm() - self.assert_(alltrue(ravel(actual == desired))) + self.assertTrue(alltrue(ravel(actual == desired))) #------------------------------------------------------------------------- # Setting drawing state variables @@ -222,19 +222,19 @@ def test_state_line_cap(self): def test_state_line_dash(self): gc = basecore2d.GraphicsContextBase() # defaults to non-dashed line - self.assert_(not gc.state.line_state.is_dashed()) + self.assertTrue(not gc.state.line_state.is_dashed()) gc.set_line_dash([1.0, 2.0], phase=2.0) gc.save_state() gc.set_line_dash([3.0, 4.0]) - self.assert_(gc.state.line_state.is_dashed()) + self.assertTrue(gc.state.line_state.is_dashed()) self.assertEqual(gc.state.line_state.line_dash[0], 0) - self.assert_(alltrue(ravel(gc.state.line_state.line_dash[1] == + self.assertTrue(alltrue(ravel(gc.state.line_state.line_dash[1] == array([3.0, 4.0])))) gc.restore_state() - self.assert_(gc.state.line_state.is_dashed()) + self.assertTrue(gc.state.line_state.is_dashed()) self.assertEqual(gc.state.line_state.line_dash[0], 2.0) - self.assert_(alltrue(ravel(gc.state.line_state.line_dash[1] == + self.assertTrue(alltrue(ravel(gc.state.line_state.line_dash[1] == array([1.0, 2.0])))) # pattern must be a container with atleast two values @@ -268,24 +268,24 @@ def test_state_alpha(self): def test_state_fill_color(self): gc = basecore2d.GraphicsContextBase() # defaults to [0,0,0,1] - self.assert_(alltrue(gc.state.fill_color == array([0, 0, 0, 1]))) + self.assertTrue(alltrue(gc.state.fill_color == array([0, 0, 0, 1]))) gc.set_fill_color((0, 1, 0, 1)) gc.save_state() gc.set_fill_color((1, 1, 1, 1)) - self.assert_(alltrue(gc.state.fill_color == array([1, 1, 1, 1]))) + self.assertTrue(alltrue(gc.state.fill_color == array([1, 1, 1, 1]))) gc.restore_state() - self.assert_(alltrue(gc.state.fill_color == array([0, 1, 0, 1]))) + self.assertTrue(alltrue(gc.state.fill_color == array([0, 1, 0, 1]))) def test_state_stroke_color(self): gc = basecore2d.GraphicsContextBase() # defaults to [0,0,0,1] - self.assert_(alltrue(gc.state.line_state.line_color == array([0, 0, 0, 1]))) + self.assertTrue(alltrue(gc.state.line_state.line_color == array([0, 0, 0, 1]))) gc.set_stroke_color((0, 1, 0, 1)) gc.save_state() gc.set_stroke_color((1, 1, 1, 1)) - self.assert_(alltrue(gc.state.line_state.line_color == array([1, 1, 1, 1]))) + self.assertTrue(alltrue(gc.state.line_state.line_color == array([1, 1, 1, 1]))) gc.restore_state() - self.assert_(alltrue(gc.state.line_state.line_color == array([0, 1, 0, 1]))) + self.assertTrue(alltrue(gc.state.line_state.line_color == array([0, 1, 0, 1]))) def test_state_character_spacing(self): gc = basecore2d.GraphicsContextBase() @@ -330,12 +330,12 @@ def test_state_context_manager(self): gc.set_line_width(10) self.assertEqual(gc.state.line_state.line_width, 10) gc.set_fill_color((1, 1, 1, 1)) - self.assert_(alltrue(gc.state.fill_color == array([1, 1, 1, 1]))) + self.assertTrue(alltrue(gc.state.fill_color == array([1, 1, 1, 1]))) # Verify that we're back to the earlier settings. self.assertEqual(gc.state.antialias, 0) self.assertEqual(gc.state.line_state.line_width, 5) - self.assert_(alltrue(gc.state.fill_color == array([0, 1, 0, 1]))) + self.assertTrue(alltrue(gc.state.fill_color == array([0, 1, 0, 1]))) def test_state_context_manager_nested(self): gc = basecore2d.GraphicsContextBase() @@ -352,7 +352,7 @@ def test_state_context_manager_nested(self): gc.set_line_width(10) self.assertEqual(gc.state.line_state.line_width, 10) gc.set_fill_color((1, 1, 1, 1)) - self.assert_(alltrue(gc.state.fill_color == array([1, 1, 1, 1]))) + self.assertTrue(alltrue(gc.state.fill_color == array([1, 1, 1, 1]))) with gc: # Change the state properties. @@ -361,18 +361,18 @@ def test_state_context_manager_nested(self): gc.set_line_width(2) self.assertEqual(gc.state.line_state.line_width, 2) gc.set_fill_color((1, 1, 0, 1)) - self.assert_(alltrue(gc.state.fill_color == + self.assertTrue(alltrue(gc.state.fill_color == array([1, 1, 0, 1]))) # Verify that we're back to the earlier settings. self.assertEqual(gc.state.antialias, 1) self.assertEqual(gc.state.line_state.line_width, 10) - self.assert_(alltrue(gc.state.fill_color == array([1, 1, 1, 1]))) + self.assertTrue(alltrue(gc.state.fill_color == array([1, 1, 1, 1]))) # Verify that we're back to the earlier settings. self.assertEqual(gc.state.antialias, 0) self.assertEqual(gc.state.line_state.line_width, 5) - self.assert_(alltrue(gc.state.fill_color == array([0, 1, 0, 1]))) + self.assertTrue(alltrue(gc.state.fill_color == array([0, 1, 0, 1]))) #------------------------------------------------------------------------- # Begin/End Page @@ -438,7 +438,7 @@ def test_is_path_empty1(self): """ A graphics context should start with an empty path. """ gc = basecore2d.GraphicsContextBase() - self.assert_(gc.is_path_empty()) + self.assertTrue(gc.is_path_empty()) def test_is_path_empty2(self): """ A path that has moved to a point, but still hasn't drawn @@ -447,7 +447,7 @@ def test_is_path_empty2(self): gc = basecore2d.GraphicsContextBase() x, y = 1., 2. gc.move_to(x, y) - self.assert_(gc.is_path_empty()) + self.assertTrue(gc.is_path_empty()) def test_is_path_empty3(self): """ A path that has moved to a point multiple times, but hasn't drawn @@ -459,7 +459,7 @@ def test_is_path_empty3(self): # this should create another path. x, y = 1., 2.5 gc.move_to(x, y) - self.assert_(gc.is_path_empty()) + self.assertTrue(gc.is_path_empty()) def test_is_path_empty4(self): """ We've added a line, so the path is no longer empty. @@ -468,7 +468,7 @@ def test_is_path_empty4(self): x, y = 1., 2. gc.move_to(x, y) gc.line_to(x, y) - self.assert_(not gc.is_path_empty()) + self.assertTrue(not gc.is_path_empty()) #------------------------------------------------------------------------- # Test drawing path add line diff --git a/kiva/tests/dummy.py b/kiva/tests/dummy.py index 773cb3c12..953f3be53 100644 --- a/kiva/tests/dummy.py +++ b/kiva/tests/dummy.py @@ -1,5 +1,7 @@ from __future__ import with_statement +import six + from enable.kiva_graphics_context import GraphicsContext from kiva import affine from kiva.fonttools import Font @@ -241,7 +243,7 @@ def test_handling_text(gc): ) gcs = { 'eps': ps.PSGC, 'svg': svg.GraphicsContext } - for fmt, gc in gcs.iteritems(): + for fmt, gc in six.iteritems(gcs): for test_func in tests: context = gc((800, 600)) test_func(context) diff --git a/kiva/tests/test_graphics_context.py b/kiva/tests/test_graphics_context.py index 6ca75ba0b..8b6e9699a 100644 --- a/kiva/tests/test_graphics_context.py +++ b/kiva/tests/test_graphics_context.py @@ -7,6 +7,8 @@ from hypothesis import given from hypothesis.strategies import sampled_from +import six + from kiva.image import GraphicsContext from kiva.compat import piltostring @@ -87,6 +89,7 @@ def test_ambient_plus_image_alpha(self, color): # alpha blending is approximate, allow channel differences of to 2. self.assert_images_close(desired, actual, diff_allowed=slop_allowed) + @unittest.skipIf(six.PY3, reason="Crashes on python 3. See GH #95.") def test_rect_scale(self): color = 0.0 orig_sz = (10, 10) @@ -105,6 +108,7 @@ def test_rect_scale(self): desired = gc.bmp_array self.assert_images_equal(desired, actual) + @unittest.skipIf(six.PY3, reason="Crashes on python 3. See GH #95.") def test_rect_scale_translate(self): color = 0.0 orig_sz = (10, 10) diff --git a/kiva/tests/test_macport.py b/kiva/tests/test_macport.py index 77d57e2d9..16a83274b 100644 --- a/kiva/tests/test_macport.py +++ b/kiva/tests/test_macport.py @@ -1,3 +1,5 @@ +from __future__ import print_function + import sys from traitsui.tests._tools import skip_if_not_wx @@ -32,10 +34,10 @@ def __init__(self): def OnPaint(self, evt): dc = wx.PaintDC(self) - print "paintdc.this:", dc.this - print "paintdc.macport: %x" % get_macport(dc) - print "memdc.this:", self.memdc.this - print "memdc.macport: %x" % get_macport(self.memdc) + print("paintdc.this:", dc.this) + print("paintdc.macport: %x" % get_macport(dc)) + print("memdc.this:", self.memdc.this) + print("memdc.macport: %x" % get_macport(self.memdc)) # We're done here self.Close() diff --git a/kiva/tests/test_pdfmetrics.py b/kiva/tests/test_pdfmetrics.py new file mode 100644 index 000000000..01c5d40f1 --- /dev/null +++ b/kiva/tests/test_pdfmetrics.py @@ -0,0 +1,53 @@ +import os +import unittest +import tempfile +from contextlib import contextmanager + +from kiva.pdfmetrics import parseAFMFile + + +@contextmanager +def ensure_deleted(): + file_handle = None + try: + file_handle = tempfile.NamedTemporaryFile(mode="w", delete=False) + yield file_handle + finally: + if file_handle is not None: + os.unlink(file_handle.name) + + +class TestparseAFMFile(unittest.TestCase): + def test_empty_file(self): + # Empty file + with ensure_deleted() as f: + f.close() + with self.assertRaises(ValueError): + parseAFMFile(f.name) + + def test_single_line_file(self): + # Single Line + with ensure_deleted() as f: + f.write("SINGLE LINE") + f.close() + with self.assertRaises(ValueError): + parseAFMFile(f.name) + + def test_two_lines_file(self): + # Single Line + text = "SINGLE LINE\nSECOND LINE" + + with ensure_deleted() as f: + f.write(text) + f.close() + topLevel, glyphLevel = parseAFMFile(f.name) + self.assertEqual(topLevel, {}) + self.assertEqual(glyphLevel, []) + + text_mac = text.replace('\n', '\r') + with ensure_deleted() as f: + f.write(text_mac) + f.close() + topLevel, glyphLevel = parseAFMFile(f.name) + self.assertEqual(topLevel, {}) + self.assertEqual(glyphLevel, []) diff --git a/kiva/trait_defs/api.py b/kiva/trait_defs/api.py index 41f12c9a1..5fab62fc7 100644 --- a/kiva/trait_defs/api.py +++ b/kiva/trait_defs/api.py @@ -1 +1 @@ -from kiva_font_trait import KivaFont +from .kiva_font_trait import KivaFont diff --git a/kiva/trait_defs/kiva_font_trait.py b/kiva/trait_defs/kiva_font_trait.py index 72a8bdcb0..a302da713 100644 --- a/kiva/trait_defs/kiva_font_trait.py +++ b/kiva/trait_defs/kiva_font_trait.py @@ -118,11 +118,11 @@ def validate ( self, object, name, value ): facename = [] for word in value.split(): lword = word.lower() - if font_families.has_key( lword ): + if lword in font_families: family = font_families[ lword ] - elif font_styles.has_key( lword ): + elif lword in font_styles: style = font_styles[ lword ] - elif font_weights.has_key( lword ): + elif lword in font_weights: weight = font_weights[ lword ] elif lword == 'underline': underline = 1 @@ -147,7 +147,7 @@ def validate ( self, object, name, value ): except: pass - raise TraitError, ( object, name, 'a font descriptor string', + raise TraitError( object, name, 'a font descriptor string', repr( value ) ) def info ( self ): diff --git a/kiva/trait_defs/ui/wx/kiva_font_editor.py b/kiva/trait_defs/ui/wx/kiva_font_editor.py index b95eb3f9a..398e02973 100644 --- a/kiva/trait_defs/ui/wx/kiva_font_editor.py +++ b/kiva/trait_defs/ui/wx/kiva_font_editor.py @@ -119,7 +119,7 @@ def str_font ( self, font ): def all_facenames ( self ): """ Returns a list of all available font typeface names. """ - facenames = fontManager.ttfdict.keys() + facenames = list(fontManager.ttfdict.keys()) return facenames def KivaFontEditor (*args, **traits): diff --git a/setup.py b/setup.py index 17463f287..ef3b9857a 100644 --- a/setup.py +++ b/setup.py @@ -289,9 +289,5 @@ def run(self): }, platforms=["Windows", "Linux", "Mac OS-X", "Unix", "Solaris"], zip_safe=False, - use_2to3=True, - # The imports fixer makes breaking changes (replacing __builtin__ - # with builtins) in the auto-generated SWIG files like - # kiva/agg/agg.py. - use_2to3_exclude_fixers=['lib2to3.fixes.fix_imports'], + use_2to3=False, **config)