Prepare for py3 port.

src/extra/SoundsTutorial/__init__.py

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

src/extra/SoundsTutorial/soundsTutorial.py

@@ -1,34 +1,35 @@
-# -*- coding: utf-8 -*-
-import platform
-import widgetUtils
-import os
-import paths
-import logging
-log = logging.getLogger("extra.SoundsTutorial.soundsTutorial")
-import soundsTutorial_constants
-if platform.system() == "Windows":
- import wx_ui as UI
-elif platform.system() == "Linux":
- import gtk_ui as UI
-
-class soundsTutorial(object):
- def __init__(self, sessionObject):
-  log.debug("Creating sounds tutorial object...")
-  super(soundsTutorial, self).__init__()
-  self.session = sessionObject
-  self.actions = []
-  log.debug("Loading actions for sounds tutorial...")
-  [self.actions.append(i[1]) for i in soundsTutorial_constants.actions]
-  self.files = []
-  log.debug("Searching sound files...")
-  [self.files.append(i[0]) for i in soundsTutorial_constants.actions]
-  log.debug("Creating dialog...")
-  self.dialog = UI.soundsTutorialDialog(self.actions)
-  widgetUtils.connect_event(self.dialog.play, widgetUtils.BUTTON_PRESSED, self.on_play)
-  self.dialog.get_response()
-
- def on_play(self, *args, **kwargs):
-  try:
-   self.session.sound.play(self.files[self.dialog.get_selection()]+".ogg")
-  except:
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+import platform
+import widgetUtils
+import os
+import paths
+import logging
+log = logging.getLogger("extra.SoundsTutorial.soundsTutorial")
+from . import soundsTutorial_constants
+if platform.system() == "Windows":
+ from . import wx_ui as UI
+elif platform.system() == "Linux":
+ from . import gtk_ui as UI
+
+class soundsTutorial(object):
+ def __init__(self, sessionObject):
+  log.debug("Creating sounds tutorial object...")
+  super(soundsTutorial, self).__init__()
+  self.session = sessionObject
+  self.actions = []
+  log.debug("Loading actions for sounds tutorial...")
+  [self.actions.append(i[1]) for i in soundsTutorial_constants.actions]
+  self.files = []
+  log.debug("Searching sound files...")
+  [self.files.append(i[0]) for i in soundsTutorial_constants.actions]
+  log.debug("Creating dialog...")
+  self.dialog = UI.soundsTutorialDialog(self.actions)
+  widgetUtils.connect_event(self.dialog.play, widgetUtils.BUTTON_PRESSED, self.on_play)
+  self.dialog.get_response()
+
+ def on_play(self, *args, **kwargs):
+  try:
+   self.session.sound.play(self.files[self.dialog.get_selection()]+".ogg")
+  except:
    log.exception("Error playing the %s sound" % (self.files[self.dialog.items.GetSelection()],))

src/extra/SoundsTutorial/soundsTutorial_constants.py

@@ -1,28 +1,30 @@
-#-*- coding: utf-8 -*-
-import reverse_sort
-import application
-actions = reverse_sort.reverse_sort([  ("audio", _(u"Audio tweet.")),
-  ("create_timeline", _(u"User timeline buffer created.")),
-    ("delete_timeline", _(u"Buffer destroied.")),
-    ("dm_received", _(u"Direct message received.")),
-    ("dm_sent", _(u"Direct message sent.")),
-    ("error", _(u"Error.")),
-  ("favourite", _(u"Tweet liked.")),
-  ("favourites_timeline_updated", _(u"Likes buffer updated.")),
-  ("geo",   _(u"Geotweet.")),
-("image", _("Tweet contains one or more images")),
-("limit", _(u"Boundary reached.")),
-    ("list_tweet", _(u"List updated.")),
-    ("max_length", _(u"Too many characters.")),
-    ("mention_received", _(u"Mention received.")),
-  ("new_event", _(u"New event.")),
-  ("ready", _(u"{0} is ready.").format(application.name,)),
-    ("reply_send", _(u"Mention sent.")),
-    ("retweet_send", _(u"Tweet retweeted.")),
-    ("search_updated", _(u"Search buffer updated.")),
-    ("tweet_received", _(u"Tweet received.")),
-    ("tweet_send", _(u"Tweet sent.")),
-    ("trends_updated", _(u"Trending topics buffer updated.")),
-    ("tweet_timeline", _(u"New tweet in user timeline buffer.")),
-    ("update_followers", _(u"New follower.")),
-    ("volume_changed", _(u"Volume changed."))])
+#-*- coding: utf-8 -*-
+from __future__ import absolute_import
+#-*- coding: utf-8 -*-
+from . import reverse_sort
+import application
+actions = reverse_sort.reverse_sort([  ("audio", _(u"Audio tweet.")),
+  ("create_timeline", _(u"User timeline buffer created.")),
+    ("delete_timeline", _(u"Buffer destroied.")),
+    ("dm_received", _(u"Direct message received.")),
+    ("dm_sent", _(u"Direct message sent.")),
+    ("error", _(u"Error.")),
+  ("favourite", _(u"Tweet liked.")),
+  ("favourites_timeline_updated", _(u"Likes buffer updated.")),
+  ("geo",   _(u"Geotweet.")),
+("image", _("Tweet contains one or more images")),
+("limit", _(u"Boundary reached.")),
+    ("list_tweet", _(u"List updated.")),
+    ("max_length", _(u"Too many characters.")),
+    ("mention_received", _(u"Mention received.")),
+  ("new_event", _(u"New event.")),
+  ("ready", _(u"{0} is ready.").format(application.name,)),
+    ("reply_send", _(u"Mention sent.")),
+    ("retweet_send", _(u"Tweet retweeted.")),
+    ("search_updated", _(u"Search buffer updated.")),
+    ("tweet_received", _(u"Tweet received.")),
+    ("tweet_send", _(u"Tweet sent.")),
+    ("trends_updated", _(u"Trending topics buffer updated.")),
+    ("tweet_timeline", _(u"New tweet in user timeline buffer.")),
+    ("update_followers", _(u"New follower.")),
+    ("volume_changed", _(u"Volume changed."))])