diff --git a/gaphas/__init__.py b/gaphas/__init__.py index a042704..7afe943 100644 --- a/gaphas/__init__.py +++ b/gaphas/__init__.py @@ -36,8 +36,6 @@ See the License for the specific language governing permissions and limitations under the License. """ -from __future__ import absolute_import - __version__ = "$Revision$" # $HeadURL$ diff --git a/gaphas/aspect.py b/gaphas/aspect.py index e382c26..5a3ec56 100644 --- a/gaphas/aspect.py +++ b/gaphas/aspect.py @@ -2,8 +2,6 @@ Aspects form intermediate items between tools and items. """ -from __future__ import absolute_import - import sys import warnings from builtins import object diff --git a/gaphas/canvas.py b/gaphas/canvas.py index 115af70..796381a 100644 --- a/gaphas/canvas.py +++ b/gaphas/canvas.py @@ -26,8 +26,6 @@ To get connecting items (i.e. all lines connected to a class):: lines = (c.item for c in canvas.get_connections(connected=item)) """ -from __future__ import absolute_import - import logging from builtins import map from builtins import next diff --git a/gaphas/constraint.py b/gaphas/constraint.py index 8ec9e4c..1bc8246 100644 --- a/gaphas/constraint.py +++ b/gaphas/constraint.py @@ -27,11 +27,6 @@ New constraint class should derive from Constraint class abstract class and implement `Constraint.solve_for(Variable)` method to update a variable with appropriate value. """ - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - from builtins import object import math diff --git a/gaphas/decorators.py b/gaphas/decorators.py index ad10fb8..793d20a 100644 --- a/gaphas/decorators.py +++ b/gaphas/decorators.py @@ -1,8 +1,6 @@ """ Custom decorators. """ -from __future__ import print_function - import threading from builtins import object diff --git a/gaphas/examples.py b/gaphas/examples.py index c6b06eb..63b7aa4 100644 --- a/gaphas/examples.py +++ b/gaphas/examples.py @@ -2,9 +2,6 @@ Simple example items. These items are used in various tests. """ -from __future__ import absolute_import -from __future__ import division - from gaphas.connector import Handle, PointPort, LinePort, Position from gaphas.item import Element, Item, NW, NE, SW, SE from gaphas.solver import WEAK diff --git a/gaphas/freehand.py b/gaphas/freehand.py index 8affc5c..7da4029 100644 --- a/gaphas/freehand.py +++ b/gaphas/freehand.py @@ -10,8 +10,6 @@ Cairo context using Steve Hanov's freehand drawing code. See: http://stevehanov.ca/blog/index.php?id=33 and http://stevehanov.ca/blog/index.php?id=93 """ -from __future__ import absolute_import - from builtins import object from math import sqrt from random import Random diff --git a/gaphas/geometry.py b/gaphas/geometry.py index 72b683d..5341bb5 100644 --- a/gaphas/geometry.py +++ b/gaphas/geometry.py @@ -7,8 +7,6 @@ intersections). A point is represented as a tuple `(x, y)`. """ -from __future__ import division - from builtins import object from math import sqrt diff --git a/gaphas/guide.py b/gaphas/guide.py index ee34d19..5e2c064 100644 --- a/gaphas/guide.py +++ b/gaphas/guide.py @@ -1,8 +1,6 @@ """ Module implements guides when moving items and handles around. """ -from __future__ import division - import sys from builtins import map from builtins import object diff --git a/gaphas/item.py b/gaphas/item.py index 43886d4..4a1afce 100644 --- a/gaphas/item.py +++ b/gaphas/item.py @@ -1,8 +1,6 @@ """ Basic items. """ -from __future__ import absolute_import - from builtins import map from builtins import object from builtins import range diff --git a/gaphas/matrix.py b/gaphas/matrix.py index d729c3d..0130366 100644 --- a/gaphas/matrix.py +++ b/gaphas/matrix.py @@ -7,9 +7,6 @@ Matrix Small utility class wrapping cairo.Matrix. The `Matrix` class adds state preservation capabilities. """ -from __future__ import absolute_import -from __future__ import division - from builtins import object __version__ = "$Revision$" diff --git a/gaphas/painter.py b/gaphas/painter.py index 653f5f9..51a9253 100644 --- a/gaphas/painter.py +++ b/gaphas/painter.py @@ -6,8 +6,6 @@ Painters can be swapped in and out. Each painter takes care of a layer in the canvas (such as grid, items and handles). """ -from __future__ import division - from builtins import object from cairo import ANTIALIAS_NONE, LINE_JOIN_ROUND diff --git a/gaphas/quadtree.py b/gaphas/quadtree.py index 50861a4..b8d2298 100644 --- a/gaphas/quadtree.py +++ b/gaphas/quadtree.py @@ -17,10 +17,6 @@ as a Q-tree. All forms of Quadtrees share some common features: (From Wikipedia, the free encyclopedia) """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function - import operator from builtins import map from builtins import object diff --git a/gaphas/segment.py b/gaphas/segment.py index f5948d8..a13639a 100644 --- a/gaphas/segment.py +++ b/gaphas/segment.py @@ -1,8 +1,6 @@ """ Allow for easily adding segments to lines. """ -from __future__ import division - import sys from builtins import object from builtins import zip diff --git a/gaphas/solver.py b/gaphas/solver.py index fb433a4..64aae24 100644 --- a/gaphas/solver.py +++ b/gaphas/solver.py @@ -33,10 +33,6 @@ every constraint is being asked to solve itself (`constraint.Constraint.solve_for()` method) changing appropriate variables to make the constraint valid again. """ - -from __future__ import absolute_import -from __future__ import division - from builtins import object from gaphas.state import observed, reversible_pair, reversible_property diff --git a/gaphas/tool.py b/gaphas/tool.py index ca605ee..d340868 100644 --- a/gaphas/tool.py +++ b/gaphas/tool.py @@ -30,9 +30,6 @@ Tools can handle events in different ways - event can be ignored - tool can handle the event (obviously) """ -from __future__ import division -from __future__ import print_function - from builtins import object from gi.repository import Gtk, Gdk diff --git a/gaphas/util.py b/gaphas/util.py index 6c725f0..950c3aa 100644 --- a/gaphas/util.py +++ b/gaphas/util.py @@ -1,8 +1,6 @@ """Helper functions and classes for Cairo (drawing engine used by the canvas). """ -from __future__ import division - from math import pi import cairo diff --git a/gaphas/view.py b/gaphas/view.py index 86f4722..d4a2b0a 100644 --- a/gaphas/view.py +++ b/gaphas/view.py @@ -1,9 +1,6 @@ """This module contains everything to display a Canvas on a screen. """ -from __future__ import absolute_import -from __future__ import division - from builtins import map from builtins import object diff --git a/tests/test_guide.py b/tests/test_guide.py index 8b0027c..0e053c8 100644 --- a/tests/test_guide.py +++ b/tests/test_guide.py @@ -1,7 +1,3 @@ -from __future__ import print_function - -from builtins import range - import pytest from gi.repository import Gtk diff --git a/tests/test_pickle.py b/tests/test_pickle.py index 55825d3..9c8778d 100644 --- a/tests/test_pickle.py +++ b/tests/test_pickle.py @@ -1,12 +1,8 @@ -from __future__ import print_function - import io import pickle -from builtins import object import cairo import pytest -from future import standard_library from gi.repository import Gtk from examples import demo @@ -18,8 +14,6 @@ from gaphas.view import View, GtkView # Ensure extra pickle reducers/reconstructors are loaded: import gaphas.picklers -standard_library.install_aliases() - class MyPickler(pickle.Pickler): def save(self, obj, save_persistent_id=True): diff --git a/tests/test_segment.py b/tests/test_segment.py index 1780615..33c7fa7 100644 --- a/tests/test_segment.py +++ b/tests/test_segment.py @@ -1,8 +1,6 @@ """Test segment aspects for items. """ -from __future__ import print_function - import pytest from gaphas.canvas import Canvas diff --git a/tests/test_solver.py b/tests/test_solver.py index ef949e8..958fb2c 100644 --- a/tests/test_solver.py +++ b/tests/test_solver.py @@ -1,9 +1,6 @@ """Test constraint solver. """ -from __future__ import division -from __future__ import print_function - from timeit import Timer import pytest diff --git a/tests/test_view.py b/tests/test_view.py index f64704e..538f709 100644 --- a/tests/test_view.py +++ b/tests/test_view.py @@ -1,8 +1,6 @@ """Test cases for the View class. """ -from __future__ import division - import math import pytest