Ran 2to3 on 'share' and accepted appropriate changes

share/gpodder/examples/gpodder_mark_played.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Example script that can be used as post-play extension in media players
 #
 # Set the configuration options "audio_played_dbus" and "video_played_dbus"
@@ -16,9 +16,9 @@ import sys
 import os
 
 if len(sys.argv) != 2:
-    print >>sys.stderr, """
+    print("""
     Usage: %s /path/to/episode.mp3
-    """ % (sys.argv[0],)
+    """ % (sys.argv[0],), file=sys.stderr)
     sys.exit(1)
 
 filename = os.path.abspath(sys.argv[1])
@@ -32,6 +32,6 @@ proxy = session_bus.get_object(gpodder.dbus_bus_name, \
 interface = dbus.Interface(proxy, gpodder.dbus_interface)
 
 if not interface.mark_episode_played(filename):
-    print >>sys.stderr, 'Warning: Could not mark episode as played.'
+    print('Warning: Could not mark episode as played.', file=sys.stderr)
     sys.exit(2)
 

share/gpodder/extensions/enqueue_in_mediaplayer.py

@@ -122,7 +122,7 @@ class gPodderExtension:
         self.config = container.config
 
         # Only display media players that can be found at extension load time
-        self.players = filter(lambda player: player.is_installed(), PLAYERS)
+        self.players = [player for player in PLAYERS if player.is_installed()]
 
     def on_ui_object_available(self, name, ui_object):
         if name == 'gpodder-gtk':

share/gpodder/extensions/mpris-listener.py

@@ -24,8 +24,8 @@ import dbus.service
 import gpodder
 import logging
 import time
-import urllib
-import urlparse
+import urllib.request, urllib.parse, urllib.error
+import urllib.parse
 
 logger = logging.getLogger(__name__)
 _ = gpodder.gettext
@@ -116,7 +116,7 @@ class CurrentTrackTracker(object):
             # If the status *is* playing, and *was* playing, but the position
             # has changed discontinuously, notify a stop for the old position
             if (    cur['status'] == 'Playing'
-                and (not kwargs.has_key('status') or kwargs['status'] == 'Playing')
+                and ('status' not in kwargs or kwargs['status'] == 'Playing')
                 and not subsecond_difference(cur['pos'], kwargs['pos'])
             ):
                 logger.debug('notify Stopped: playback discontinuity:' + 
@@ -175,7 +175,7 @@ class CurrentTrackTracker(object):
         ):
             return
         pos = self.pos // USECS_IN_SEC
-        file_uri = urllib.url2pathname(urlparse.urlparse(self.uri).path).encode('utf-8')
+        file_uri = urllib.request.url2pathname(urllib.parse.urlparse(self.uri).path).encode('utf-8')
         total_time = self.length // USECS_IN_SEC
         
         if status == 'Stopped':
@@ -245,16 +245,16 @@ class MPRISDBusReceiver(object):
         
         collected_info = {}
 
-        if changed_properties.has_key('PlaybackStatus'):
+        if 'PlaybackStatus' in changed_properties:
             collected_info['status'] = str(changed_properties['PlaybackStatus'])
-        if changed_properties.has_key('Metadata'):
+        if 'Metadata' in changed_properties:
             collected_info['uri'] = changed_properties['Metadata']['xesam:url']
             collected_info['length'] = changed_properties['Metadata']['mpris:length']
-        if changed_properties.has_key('Rate'):
+        if 'Rate' in changed_properties:
             collected_info['rate'] = changed_properties['Rate']
         collected_info['pos'] = self.query_position()
 
-        if not collected_info.has_key('status'):
+        if 'status' not in collected_info:
             collected_info['status'] = str(self.query_status())
         logger.debug('collected info: %r', collected_info)
 

share/gpodder/extensions/tagging.py

@@ -162,7 +162,7 @@ class Mp3File(AudioFile):
                 encoding = 3, # 3 is for utf-8
                 mime = mimetypes.guess_type(self.cover)[0],
                 type = 3,
-                desc = u'Cover',
+                desc = 'Cover',
                 data = open(self.cover).read()
             )
         )
@@ -261,7 +261,7 @@ class gPodderExtension:
             if self.container.config.auto_embed_coverart:
                 audio.insert_coverart()
 
-        logger.info(u'tagging.on_episode_downloaded(%s/%s)', episode.channel.title, episode.title)
+        logger.info('tagging.on_episode_downloaded(%s/%s)', episode.channel.title, episode.title)
 
     def get_cover(self, podcast):
         downloader = coverart.CoverDownloader()