Examples: remove use of Python 2/3 incompatible urllib/urlparse.

Plus some other rewriting to improve lisibility.

1 files changed, 4 insertions, 21 deletions

diff --git a/examples/background-image.py b/examples/background-image.py
index 450b985..127dd15 100644
--- a/examples/background-image.py
+++ b/examples/background-image.py
@@ -2,14 +2,6 @@ SUPPORTED_FORMATS = 'image/jpeg', 'image/png'
 BACKGROUND_SCHEMA = 'org.mate.background'
 BACKGROUND_KEY = 'picture-filename'
 
-try:
-    # Python 3.
-    from urllib.parse import unquote, urlparse
-except:
-    # Python 2.
-    from urllib import unquote
-    from urlparse import urlparse
-
 from gi.repository import Caja, GObject, Gio
 
 
@@ -17,21 +9,12 @@ class BackgroundImageExtension(GObject.GObject, Caja.MenuProvider):
     def __init__(self):
         self.bgsettings = Gio.Settings.new(BACKGROUND_SCHEMA)
     
-    def _filepath(self, file):
-        try:
-            file = file.get_uri()
-        except:
-            pass
-        (scheme, netloc, path, parameters, query, fragment) = urlparse(file)
-        if scheme and unquote(scheme) != 'file':
-            return None
-        return unquote(path)
-
     def menu_activate_cb(self, menu, file):
         if file.is_gone():
             return
-        
-        self.bgsettings[BACKGROUND_KEY] = self._filepath(file)
+
+        if file.get_uri_scheme() == 'file':
+            self.bgsettings[BACKGROUND_KEY] = file.get_location().get_path()
         
     def get_file_items(self, window, files):
         if len(files) != 1:
@@ -52,7 +35,7 @@ class BackgroundImageExtension(GObject.GObject, Caja.MenuProvider):
                                  label='Use as background image',
                                  tip='Set the current image as a background image')
         item.connect('activate', self.menu_activate_cb, file)
-        return item,
+        return [item]
 
     def get_background_items(self, window, file):
         return []