* print should now be functions instead of statements
* raises should now respect the new syntax
* "<>" operator was replaced by "!="

* Fixed tuple unpacking issues
* replaced has_key with "in" syntax
* exec is now a function instead of a statement

* Fixed __metaclass__ compatibility using six.add_metaclass

* replaced xrange by six.moves.range

* Fixed tuple unpacking issues
* Fixed izip issues using six

* Replaced self.assert_ with self.assertTrue

* Fixed several non-trivial list vs iterables in kiva

* Fixed several non-trivial list vs iterables in enable

* Fixed reduce function using six
* Fixed a few other issues not seen previously

* fixed unicode and unichr calls

* Fixed StringIO with six

* Fixed imports
* Fixed some StringIO that were missed in the initial pass
* Some string fixes

* Fixed issues with basestring
* fixed issues with long

* Some fixes with import *

Solved some issues while running unit test.

# Conflicts:
#	enable/savage/compliance/comparator.py
#	enable/savage/compliance/viewer.py
#	enable/savage/svg/attributes.py
#	enable/savage/svg/css/colour.py
#	enable/savage/svg/document.py
#	enable/savage/svg/tests/test_document.py
#	enable/savage/trait_defs/ui/qt4/svg_editor.py
#	kiva/agg/src/graphics_context.i
#	kiva/fonttools/fontTools/misc/textTools.py
#	kiva/fonttools/fontTools/ttLib/__init__.py
#	kiva/fonttools/fontTools/ttLib/macUtils.py
#	kiva/fonttools/fontTools/ttLib/sfnt.py
#	kiva/fonttools/fontTools/ttLib/tables/DefaultTable.py
#	kiva/fonttools/fontTools/ttLib/tables/__init__.py
#	kiva/fonttools/fontTools/ttLib/tables/_n_a_m_e.py
#	kiva/fonttools/font_manager.py
#	kiva/fonttools/misc/textTools.py
#	kiva/pdfmetrics.py
#	kiva/ps.py
#	kiva/quartz/setup.py
#	kiva/svg.py
#	kiva/tests/test_macport.py
#	setup.py

* Removed unused imports
* Changed six.u to six.text_type
* Replaced call with a dictionary comprehension in drawer.py
* Fixed an an issue with a callable in svg_regex.py
* Removed sm.zip in favour of the builtin function
* Changed print("") to print()
* Removed a pix_format keyword call.

Still missing:

* Corrections for itervalues, iterkeys and iteritems
* Some clarifications for the comments that were written
* `pdfmetrics.parseAFMFile`

* Added a test for the `test_draw_24`
* Fixed an import error in cairo.py
* Removed changes from tohtml.py
* Removed reference of CP Trac #2111 in comments
* Fixed issue in function parseAFMFile
* Added very preliminary test for parseAFMFile

# Conflicts:
#	enable/qt4/base_window.py
#	enable/wx/base_window.py

* Removed unused imports
* added `from __future__ import print_function` in tohtml.py
* fixed syntax error in vu_meter.py