Drop python2 support.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 10 insertions, 10 deletions

diff --git a/DesktopEffects/DesktopEffectsTDE.py b/DesktopEffects/DesktopEffectsTDE.py
index 127e808..e09d0c8 100755
--- a/DesktopEffects/DesktopEffectsTDE.py
+++ b/DesktopEffects/DesktopEffectsTDE.py
@@ -27,20 +27,20 @@ from tdecore import *
 import subprocess
 # for compiz-kde package checking
 import apt_pkg
-from apt.progress import OpProgress
+from apt.progress.base import OpProgress
 
 from DesktopEffectsDialog import DesktopEffectsDialog
 from DesktopEffectsCommon import DesktopEffectsCommon
 
 import gettext
-def _(str):
-    return unicode(gettext.gettext(str), 'UTF-8')
-def __(catalog,str):
-    return unicode(gettext.dgettext(catalog, str), 'UTF-8')
-def utf8(str):
-  if isinstance(str, unicode):
-      return str
-  return unicode(str, 'UTF-8')
+def _(s):
+    return str(gettext.gettext(s), 'UTF-8')
+def __(catalog, s):
+    return str(gettext.dgettext(catalog, s), 'UTF-8')
+def utf8(s):
+  if isinstance(s, str):
+      return s
+  return str(s, 'UTF-8')
 
 class DesktopEffectsTDE(DesktopEffectsDialog, DesktopEffectsCommon):
     def __init__(self):
@@ -75,7 +75,7 @@ class DesktopEffectsTDE(DesktopEffectsDialog, DesktopEffectsCommon):
       self.applyButton.setIconSet(TDEGlobal.iconLoader().loadIconSet("apply",
                                                                    TDEIcon.NoGroup, TDEIcon.SizeSmall))
 
-      # Close    
+      # Close
       self.cancelButton.setText(__("tdelibs","&Cancel"))
       self.cancelButton.setIconSet(TDEGlobal.iconLoader().loadIconSet("cancel", 
                                                                    TDEIcon.NoGroup, TDEIcon.SizeSmall))