Initial Python 3 compatible code

src/extra/AudioUploader/audioUploader.py

@@ -17,6 +17,9 @@
 #
 ############################################################
 from __future__ import absolute_import
+from __future__ import unicode_literals
+from builtins import str
+from builtins import object
 import widgetUtils
 from . import wx_ui
 from . import wx_transfer_dialogs
@@ -132,7 +135,7 @@ class audioUploader(object):
  def _play(self):
   output.speak(_(u"Playing..."))
 #  try:
-  self.playing = sound_lib.stream.FileStream(file=unicode(self.file), flags=sound_lib.stream.BASS_UNICODE)
+  self.playing = sound_lib.stream.FileStream(file=str(self.file), flags=sound_lib.stream.BASS_UNICODE)
   self.playing.play()
   self.dialog.set("play", _(u"&Stop"))
   try:

src/extra/AudioUploader/transfer.py

@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
+from builtins import object
+from past.utils import old_div
 import sys
 import threading
 import time
@@ -21,7 +25,7 @@ class Upload(object):
   self.background_thread = None
   self.transfer_rate = 0
   self.local_filename=os.path.basename(self.filename)
-  if isinstance(self.local_filename, unicode):
+  if isinstance(self.local_filename, str):
     self.local_filename=self.local_filename.encode(sys.getfilesystemencoding())
   self.fin=open(self.filename, 'rb')
   self.m = MultipartEncoder(fields={field:(self.local_filename, self.fin, "application/octet-stream")})
@@ -45,10 +49,10 @@ class Upload(object):
    self.transfer_rate = 0
   else:
    progress["percent"] = int((float(progress["current"]) / progress["total"]) * 100)
-   self.transfer_rate = progress["current"] / self.elapsed_time()
+   self.transfer_rate = old_div(progress["current"], self.elapsed_time())
   progress["speed"] = '%s/s' % convert_bytes(self.transfer_rate)
   if self.transfer_rate:
-   progress["eta"] = (progress["total"] - progress["current"]) / self.transfer_rate
+   progress["eta"] = old_div((progress["total"] - progress["current"]), self.transfer_rate)
   else:
    progress["eta"] = 0
   pub.sendMessage("uploading", data=progress)

src/extra/AudioUploader/utils.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from builtins import str
 def convert_bytes(n):
  K, M, G, T, P = 1 << 10, 1 << 20, 1 << 30, 1 << 40, 1 << 50
  if   n >= P:

src/extra/AudioUploader/wx_transfer_dialogs.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import unicode_literals
 import wx
 from .utils import *
 import widgetUtils

src/extra/AudioUploader/wx_ui.py

@@ -16,6 +16,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ############################################################
+from __future__ import unicode_literals
 import wx
 import widgetUtils
 import output

src/extra/SoundsTutorial/__init__.py

@@ -1,2 +1,3 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from .soundsTutorial import soundsTutorial

src/extra/SoundsTutorial/gtk_ui.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 from gi.repository import Gtk
 import widgetUtils
 

src/extra/SoundsTutorial/reverse_sort.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 #Reverse sort, by Bill Dengler <codeofdusk@gmail.com> for use in TWBlue http://twblue.es
 def invert_tuples(t):
     "Invert a list of tuples, so that the 0th element becomes the -1th, and the -1th becomes the 0th."

src/extra/SoundsTutorial/soundsTutorial.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import unicode_literals
+from builtins import object
 import platform
 import widgetUtils
 import os

src/extra/SoundsTutorial/soundsTutorial_constants.py

@@ -1,5 +1,6 @@
 #-*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import unicode_literals
 #-*- coding: utf-8 -*-
 from . import reverse_sort
 import application

src/extra/SoundsTutorial/wx_ui.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import wx
 import widgetUtils
 

src/extra/SpellChecker/__init__.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import spellchecker
 import platform
 if platform.system() == "Windows":

src/extra/SpellChecker/spellchecker.py

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import unicode_literals
+from builtins import next
+from builtins import object
 import os
 import logging
 from . import wx_ui

src/extra/SpellChecker/twitterFilter.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import re
 from enchant.tokenize import Filter
 

src/extra/SpellChecker/wx_ui.py

@@ -16,6 +16,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ############################################################
+from __future__ import unicode_literals
 import wx
 import application
 

src/extra/autocompletionUsers/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
 from . import completion, settings

src/extra/autocompletionUsers/completion.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import unicode_literals
+from builtins import object
 import output
 from . import storage
 from . import wx_menu

src/extra/autocompletionUsers/manage.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
+from builtins import object
 from . import storage
 import widgetUtils
 from . import wx_manage

src/extra/autocompletionUsers/settings.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
+from builtins import object
 from . import storage
 import widgetUtils
 from . import wx_settings

src/extra/autocompletionUsers/storage.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+from builtins import object
 import sqlite3, paths
 
 class storage(object):

src/extra/autocompletionUsers/wx_manage.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import wx
 import widgetUtils
 from multiplatform_widgets import widgets

src/extra/autocompletionUsers/wx_menu.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import wx
 
 class menu(wx.Menu):

src/extra/autocompletionUsers/wx_settings.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import wx
 import widgetUtils
 import application

src/extra/ocr/OCRSpace.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 """ original module taken and modified from https://github.com/ctoth/cloudOCR"""
+from __future__ import unicode_literals
+from builtins import object
 import requests
 
 translatable_langs = [_(u"Detect automatically"), _(u"Danish"), _(u"Dutch"), _(u"English"), _(u"Finnish"), _(u"French"), _(u"German"), _(u"Hungarian"), _(u"Korean"), _(u"Italian"), _(u"Japanese"), _(u"Polish"), _(u"Portuguese"), _(u"Russian"), _(u"Spanish"), _(u"Turkish")]

src/extra/ocr/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
 from . import OCRSpace

src/extra/translator/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import translator
 import platform
 if platform.system() == "Windows":

src/extra/translator/translator.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+from builtins import zip
 from yandex_translate import YandexTranslate
 
 def translate(text="", target="en"):

src/extra/translator/wx_ui.py

@@ -17,6 +17,7 @@
 #
 ############################################################
 from __future__ import absolute_import
+from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
 ############################################################
 #    Copyright (c) 2013, 2014 Manuel Eduardo Cortéz Vallejo <manuel@manuelcortez.net>