Apply pyupgrade --py36-plus.

This removes some 'u' prefixes and converts simple format() calls to f-strings.

16 files changed, 37 insertions, 37 deletions

diff --git a/mediagoblin/media_types/__init__.py b/mediagoblin/media_types/__init__.py
index 17f520a3..a1556f34 100644
--- a/mediagoblin/media_types/__init__.py
+++ b/mediagoblin/media_types/__init__.py
@@ -68,10 +68,10 @@ def sniff_media_contents(media_file, filename):
     '''
     media_type = hook_handle('sniff_handler', media_file, filename)
     if media_type:
-        _log.info('{} accepts the file'.format(media_type))
+        _log.info(f'{media_type} accepts the file')
         return media_type, hook_handle(('media_manager', media_type))
     else:
-        _log.debug('{} did not accept the file'.format(media_type))
+        _log.debug(f'{media_type} did not accept the file')
         raise FileTypeNotSupported(
             # TODO: Provide information on which file types are supported
             _('Sorry, I don\'t support that file type :('))
@@ -129,7 +129,7 @@ def type_match_handler(media_file, filename):
                 _log.debug(e)
                 raise
         else:
-            _log.info('No plugins handled extension {}'.format(ext))
+            _log.info(f'No plugins handled extension {ext}')
     else:
         _log.info('File {} has no known file extension, let\'s hope '
                 'the sniffers get it.'.format(filename))
diff --git a/mediagoblin/media_types/ascii/asciitoimage.py b/mediagoblin/media_types/ascii/asciitoimage.py
index 0bd72fe4..8b32986e 100644
--- a/mediagoblin/media_types/ascii/asciitoimage.py
+++ b/mediagoblin/media_types/ascii/asciitoimage.py
@@ -108,7 +108,7 @@ class AsciiToImage:
         for line in lines:
             line_length = len(line)
 
-            _log.debug('Writing line at {}'.format(char_pos))
+            _log.debug(f'Writing line at {char_pos}')
 
             for _pos in range(0, line_length):
                 char = line[_pos]
diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py
index 6c5f3365..b321a461 100644
--- a/mediagoblin/media_types/ascii/processing.py
+++ b/mediagoblin/media_types/ascii/processing.py
@@ -37,7 +37,7 @@ MEDIA_TYPE = 'mediagoblin.media_types.ascii'
 
 
 def sniff_handler(media_file, filename):
-    _log.info('Sniffing {}'.format(MEDIA_TYPE))
+    _log.info(f'Sniffing {MEDIA_TYPE}')
 
     name, ext = os.path.splitext(filename)
     clean_ext = ext[1:].lower()
diff --git a/mediagoblin/media_types/audio/audiotospectrogram.py b/mediagoblin/media_types/audio/audiotospectrogram.py
index 5ad89b93..27eaad1f 100644
--- a/mediagoblin/media_types/audio/audiotospectrogram.py
+++ b/mediagoblin/media_types/audio/audiotospectrogram.py
@@ -278,11 +278,11 @@ if __name__ == "__main__":
     import sys
 
     def printProgress(p):
-        sys.stdout.write("\rProgress : {}%".format(p))
+        sys.stdout.write(f"\rProgress : {p}%")
         sys.stdout.flush()
 
     if not (len(sys.argv) == 2 or len(sys.argv) == 3):
-        print("Usage:\n{} input_file [output_file]".format(sys.argv[0]))
+        print(f"Usage:\n{sys.argv[0]} input_file [output_file]")
         exit()
 
     audioFile = sys.argv[1]
@@ -292,6 +292,6 @@ if __name__ == "__main__":
     else:
         outputFile = 'spectrogram.png'
 
-    sys.stdout.write("Input    : {}\nOutput   : {}\n".format(audioFile, outputFile))
+    sys.stdout.write(f"Input    : {audioFile}\nOutput   : {outputFile}\n")
     drawSpectrogram(audioFile, outputFile, progressCallback = printProgress)
     sys.stdout.write("\nDone!\n")
diff --git a/mediagoblin/media_types/audio/processing.py b/mediagoblin/media_types/audio/processing.py
index 0b06c529..f1c613ab 100644
--- a/mediagoblin/media_types/audio/processing.py
+++ b/mediagoblin/media_types/audio/processing.py
@@ -35,7 +35,7 @@ MEDIA_TYPE = 'mediagoblin.media_types.audio'
 
 
 def sniff_handler(media_file, filename):
-    _log.info('Sniffing {}'.format(MEDIA_TYPE))
+    _log.info(f'Sniffing {MEDIA_TYPE}')
     try:
         data = discover(media_file.name)
     except Exception as e:
diff --git a/mediagoblin/media_types/audio/transcoders.py b/mediagoblin/media_types/audio/transcoders.py
index 308e16d3..b0a9fb5c 100644
--- a/mediagoblin/media_types/audio/transcoders.py
+++ b/mediagoblin/media_types/audio/transcoders.py
@@ -45,7 +45,7 @@ Gst.init(None)
 
 class Python3AudioThumbnailer:
     def __init__(self):
-        _log.info('Initializing {}'.format(self.__class__.__name__))
+        _log.info(f'Initializing {self.__class__.__name__}')
 
     def spectrogram(self, src, dst, **kw):
         from mediagoblin.media_types.audio import audiotospectrogram
@@ -85,7 +85,7 @@ AudioThumbnailer = Python3AudioThumbnailer
 
 class AudioTranscoder:
     def __init__(self):
-        _log.info('Initializing {}'.format(self.__class__.__name__))
+        _log.info(f'Initializing {self.__class__.__name__}')
 
         # Instantiate MainLoop
         self._loop = GObject.MainLoop()
@@ -96,10 +96,10 @@ class AudioTranscoder:
         def _on_pad_added(element, pad, connect_to):
             caps = pad.query_caps(None)
             name = caps.to_string()
-            _log.debug('on_pad_added: {}'.format(name))
+            _log.debug(f'on_pad_added: {name}')
             if name.startswith('audio') and not connect_to.is_linked():
                 pad.link(connect_to)
-        _log.info('Transcoding {} into {}'.format(src, dst))
+        _log.info(f'Transcoding {src} into {dst}')
         self.__on_progress = progress_callback
         # Set up pipeline
         tolerance = 80000000
@@ -155,7 +155,7 @@ class AudioTranscoder:
             (success, percent) = structure.get_int('percent')
             if self.__on_progress and success:
                 self.__on_progress(percent)
-            _log.info('{}% done...'.format(percent))
+            _log.info(f'{percent}% done...')
         elif message.type == Gst.MessageType.EOS:
             _log.info('Done')
             self.halt()
diff --git a/mediagoblin/media_types/blog/models.py b/mediagoblin/media_types/blog/models.py
index 6bb5e076..802bbb62 100644
--- a/mediagoblin/media_types/blog/models.py
+++ b/mediagoblin/media_types/blog/models.py
@@ -48,7 +48,7 @@ class Blog(Base, BlogMixin):
 
     @property
     def slug_or_id(self):
-        return (self.slug or 'blog_{}'.format(self.id))
+        return (self.slug or f'blog_{self.id}')
  
     def get_all_blog_posts(self, state=None):
         blog_posts = Session.query(MediaEntry).join(BlogPostData)\
diff --git a/mediagoblin/media_types/image/processing.py b/mediagoblin/media_types/image/processing.py
index 95023731..acc21867 100644
--- a/mediagoblin/media_types/image/processing.py
+++ b/mediagoblin/media_types/image/processing.py
@@ -151,7 +151,7 @@ SUPPORTED_FILETYPES = ['png', 'gif', 'jpg', 'jpeg', 'tiff']
 
 
 def sniff_handler(media_file, filename):
-    _log.info('Sniffing {}'.format(MEDIA_TYPE))
+    _log.info(f'Sniffing {MEDIA_TYPE}')
     name, ext = os.path.splitext(filename)
     clean_ext = ext[1:].lower()  # Strip the . from ext and make lowercase
 
diff --git a/mediagoblin/media_types/pdf/processing.py b/mediagoblin/media_types/pdf/processing.py
index 3792cfbd..d6bb4eb5 100644
--- a/mediagoblin/media_types/pdf/processing.py
+++ b/mediagoblin/media_types/pdf/processing.py
@@ -169,7 +169,7 @@ def check_prerequisites():
     return True
 
 def sniff_handler(media_file, filename):
-    _log.info('Sniffing {}'.format(MEDIA_TYPE))
+    _log.info(f'Sniffing {MEDIA_TYPE}')
     if not check_prerequisites():
         return None
 
diff --git a/mediagoblin/media_types/raw_image/processing.py b/mediagoblin/media_types/raw_image/processing.py
index 68d9bffe..b0178527 100644
--- a/mediagoblin/media_types/raw_image/processing.py
+++ b/mediagoblin/media_types/raw_image/processing.py
@@ -35,7 +35,7 @@ ACCEPTED_EXTENSIONS = ['nef', 'cr2']
 # The entire function have to be copied
 
 def sniff_handler(media_file, filename):
-    _log.info('Sniffing {}'.format(MEDIA_TYPE))
+    _log.info(f'Sniffing {MEDIA_TYPE}')
     name, ext = os.path.splitext(filename)
     clean_ext = ext[1:].lower()  # Strip the . from ext and make lowercase
 
diff --git a/mediagoblin/media_types/stl/processing.py b/mediagoblin/media_types/stl/processing.py
index b4d9fe44..384a668f 100644
--- a/mediagoblin/media_types/stl/processing.py
+++ b/mediagoblin/media_types/stl/processing.py
@@ -48,7 +48,7 @@ BLEND_SCRIPT = pkg_resources.resource_filename(
 
 
 def sniff_handler(media_file, filename):
-    _log.info('Sniffing {}'.format(MEDIA_TYPE))
+    _log.info(f'Sniffing {MEDIA_TYPE}')
 
     name, ext = os.path.splitext(filename)
     clean_ext = ext[1:].lower()
diff --git a/mediagoblin/media_types/tools.py b/mediagoblin/media_types/tools.py
index 72b4ab16..d773b8d7 100644
--- a/mediagoblin/media_types/tools.py
+++ b/mediagoblin/media_types/tools.py
@@ -40,7 +40,7 @@ def discover(src):
     # init before import to work around https://bugzilla.gnome.org/show_bug.cgi?id=736260
     from gi.repository import GstPbutils
 
-    _log.info('Discovering {}...'.format(src))
-    uri = 'file://{}'.format(src)
+    _log.info(f'Discovering {src}...')
+    uri = f'file://{src}'
     discoverer = GstPbutils.Discoverer.new(60 * Gst.SECOND)
     return discoverer.discover_uri(uri)
diff --git a/mediagoblin/media_types/video/__init__.py b/mediagoblin/media_types/video/__init__.py
index 356e0bb8..0a936719 100644
--- a/mediagoblin/media_types/video/__init__.py
+++ b/mediagoblin/media_types/video/__init__.py
@@ -40,7 +40,7 @@ class VideoMediaManager(MediaManagerBase):
         video_res = video_config['available_resolutions']
         video_res.remove(video_config['default_resolution'])
         video_res.insert(0, video_config['default_resolution'])
-        video_res = ['webm_{}'.format(x) for x in video_res]
+        video_res = [f'webm_{x}' for x in video_res]
         return (['webm_video'] + video_res + ['original'])
 
 
diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py
index 466ab194..ca7e801c 100644
--- a/mediagoblin/media_types/video/processing.py
+++ b/mediagoblin/media_types/video/processing.py
@@ -49,14 +49,14 @@ class VideoTranscodingFail(BaseProcessingFail):
 
 def sniffer(media_file):
     '''New style sniffer, used in two-steps check; requires to have .name'''
-    _log.info('Sniffing {}'.format(MEDIA_TYPE))
+    _log.info(f'Sniffing {MEDIA_TYPE}')
     try:
         data = transcoders.discover(media_file.name)
     except Exception as e:
         # this is usually GLib.GError, but we don't really care which one
-        _log.warning('GStreamer: {}'.format(str(e)))
-        raise MissingComponents('GStreamer: {}'.format(str(e)))
-    _log.debug('Discovered: {}'.format(data))
+        _log.warning(f'GStreamer: {str(e)}')
+        raise MissingComponents(f'GStreamer: {str(e)}')
+    _log.debug(f'Discovered: {data}')
 
     if not data.get_video_streams():
         raise MissingComponents('No video streams found in this video')
@@ -64,7 +64,7 @@ def sniffer(media_file):
     if data.get_result() != 0:  # it's 0 if success
         try:
             missing = data.get_misc().get_string('name')
-            _log.warning('GStreamer: missing {}'.format(missing))
+            _log.warning(f'GStreamer: missing {missing}')
         except AttributeError as e:
             # AttributeError happens here on gstreamer >1.4, when get_misc
             # returns None. There is a special function to get info about
@@ -74,7 +74,7 @@ def sniffer(media_file):
             _log.warning('GStreamer: missing: {}'.format(', '.join(details)))
             missing = ', '.join(['{} ({})'.format(*d.split('|')[3:])
                                   for d in details])
-        raise MissingComponents('{} is missing'.format(missing))
+        raise MissingComponents(f'{missing} is missing')
 
     return MEDIA_TYPE
 
@@ -87,13 +87,13 @@ def sniff_handler(media_file, filename):
 
     if clean_ext in EXCLUDED_EXTS:
         # We don't handle this filetype, though gstreamer might think we can
-        _log.info('Refused to process {} due to excluded extension'.format(filename))
+        _log.info(f'Refused to process {filename} due to excluded extension')
         return None
 
     try:
         return sniffer(media_file)
     except:
-        _log.error('Could not discover {}'.format(filename))
+        _log.error(f'Could not discover {filename}')
         return None
 
 def get_tags(stream_info):
@@ -258,7 +258,7 @@ class CommonVideoProcessor(MediaProcessor):
         # If we didn't transcode, then we need to keep the original
         self.did_transcode = False
         for each_res in self.video_config['available_resolutions']:
-            if 'webm_{}'.format(each_res) in self.entry.media_files:
+            if f'webm_{each_res}' in self.entry.media_files:
                 self.did_transcode = True
                 break
         if not self.did_transcode or self.video_config['keep_original']:
diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py
index b5fd08e6..2d03bf4c 100644
--- a/mediagoblin/media_types/video/transcoders.py
+++ b/mediagoblin/media_types/video/transcoders.py
@@ -62,7 +62,7 @@ def capture_thumb(video_path, dest_path, width=None, height=None, percent=0.5):
         '''This is a callback to dynamically add element to pipeline'''
         caps = pad.query_caps(None)
         name = caps.to_string()
-        _log.debug('on_pad_added: {}'.format(name))
+        _log.debug(f'on_pad_added: {name}')
         if name.startswith('video') and not connect_to.is_linked():
             pad.link(connect_to)
 
@@ -70,7 +70,7 @@ def capture_thumb(video_path, dest_path, width=None, height=None, percent=0.5):
     # ! CAPS ! appsink
     pipeline = Gst.Pipeline()
     uridecodebin = Gst.ElementFactory.make('uridecodebin', None)
-    uridecodebin.set_property('uri', 'file://{}'.format(video_path))
+    uridecodebin.set_property('uri', f'file://{video_path}')
     videoconvert = Gst.ElementFactory.make('videoconvert', None)
     uridecodebin.connect('pad-added', pad_added,
                          videoconvert.get_static_pad('sink'))
@@ -104,7 +104,7 @@ def capture_thumb(video_path, dest_path, width=None, height=None, percent=0.5):
     # timeout of 3 seconds below was set experimentally
     state = pipeline.get_state(Gst.SECOND * 3)
     if state[0] != Gst.StateChangeReturn.SUCCESS:
-        _log.warning('state change failed, {}'.format(state))
+        _log.warning(f'state change failed, {state}')
         return
 
     # get duration
@@ -139,7 +139,7 @@ def capture_thumb(video_path, dest_path, width=None, height=None, percent=0.5):
     im = Image.frombytes('RGB', (width, height),
                          buffer.extract_dup(0, buffer.get_size()))
     im.save(dest_path)
-    _log.info('thumbnail saved to {}'.format(dest_path))
+    _log.info(f'thumbnail saved to {dest_path}')
 
     # cleanup
     pipeline.set_state(Gst.State.NULL)
@@ -374,7 +374,7 @@ class VideoTranscoder:
                     _log.info('{percent}% of {dest} resolution done..'
                               '.'.format(percent=percent, dest=self.destination_dimensions))
         elif message.type == Gst.MessageType.ERROR:
-            _log.error('Got error: {}'.format(message.parse_error()))
+            _log.error(f'Got error: {message.parse_error()}')
             self.dst_data = None
             self.__stop()
 
diff --git a/mediagoblin/media_types/video/util.py b/mediagoblin/media_types/video/util.py
index 023194b5..88a22caf 100644
--- a/mediagoblin/media_types/video/util.py
+++ b/mediagoblin/media_types/video/util.py
@@ -43,7 +43,7 @@ def skip_transcode(metadata, size):
     # XXX: how were we supposed to use it?
     medium_config = mgg.global_config['media:medium']
 
-    _log.debug('skip_transcode config: {}'.format(config))
+    _log.debug(f'skip_transcode config: {config}')
 
     metadata_tags = metadata.get_tags()
     if not metadata_tags: