diff options
Diffstat (limited to 'mediagoblin/plugins')
23 files changed, 100 insertions, 101 deletions
diff --git a/mediagoblin/plugins/api/__init__.py b/mediagoblin/plugins/api/__init__.py index 1eddd9e0..51e22e85 100644 --- a/mediagoblin/plugins/api/__init__.py +++ b/mediagoblin/plugins/api/__init__.py @@ -28,7 +28,7 @@ def setup_plugin(): config = pluginapi.get_config(__name__) - _log.debug('API config: {0}'.format(config)) + _log.debug('API config: {}'.format(config)) routes = [ ('mediagoblin.plugins.api.test', diff --git a/mediagoblin/plugins/api/tools.py b/mediagoblin/plugins/api/tools.py index e406888e..eff9009d 100644 --- a/mediagoblin/plugins/api/tools.py +++ b/mediagoblin/plugins/api/tools.py @@ -30,7 +30,7 @@ from mediagoblin.storage.filestorage import BasicFileStorage _log = logging.getLogger(__name__) -class Auth(object): +class Auth: ''' An object with two significant methods, 'trigger' and 'run'. @@ -115,7 +115,7 @@ def api_auth(controller): for auth in PluginManager().get_hook_callables('auth'): if auth.trigger(request): - _log.debug('{0} believes it is capable of authenticating this request.'.format(auth)) + _log.debug('{} believes it is capable of authenticating this request.'.format(auth)) auth_candidates.append(auth) # If we can't find any authentication methods, we should not let them @@ -126,7 +126,7 @@ def api_auth(controller): # For now, just select the first one in the list auth = auth_candidates[0] - _log.debug('Using {0} to authorize request {1}'.format( + _log.debug('Using {} to authorize request {}'.format( auth, request.url)) if not auth(request, *args, **kw): diff --git a/mediagoblin/plugins/api/views.py b/mediagoblin/plugins/api/views.py index fdd22ace..84f919b4 100644 --- a/mediagoblin/plugins/api/views.py +++ b/mediagoblin/plugins/api/views.py @@ -54,16 +54,16 @@ def post_entry(request): callback_url = request.form.get('callback_url') if callback_url: - callback_url = six.text_type(callback_url) + callback_url = str(callback_url) try: entry = submit_media( mg_app=request.app, user=request.user, submitted_file=request.files['file'], filename=request.files['file'].filename, - title=six.text_type(request.form.get('title')), - description=six.text_type(request.form.get('description')), - license=six.text_type(request.form.get('license', '')), - tags_string=six.text_type(request.form.get('tags', '')), + title=str(request.form.get('title')), + description=str(request.form.get('description')), + license=str(request.form.get('license', '')), + tags_string=str(request.form.get('tags', '')), callback_url=callback_url) return json_response(get_entry_serializable(entry, request.urlgen)) @@ -71,7 +71,7 @@ def post_entry(request): # Handle upload limit issues except FileUploadLimit: raise BadRequest( - _(u'Sorry, the file size is too big.')) + _('Sorry, the file size is too big.')) except UserUploadLimit: raise BadRequest( _('Sorry, uploading this file will put you over your' @@ -99,7 +99,7 @@ def get_entries(request): entries = request.db.MediaEntry.query # TODO: Make it possible to fetch unprocessed media, or media in-processing - entries = entries.filter_by(state=u'processed') + entries = entries.filter_by(state='processed') # TODO: Add sort order customization entries = entries.order_by(request.db.MediaEntry.created.desc()) diff --git a/mediagoblin/plugins/archivalook/models.py b/mediagoblin/plugins/archivalook/models.py index 3d8dd756..a7f72642 100644 --- a/mediagoblin/plugins/archivalook/models.py +++ b/mediagoblin/plugins/archivalook/models.py @@ -64,17 +64,17 @@ class FeaturedMedia(Base): self.save() def demote(self): - if self.is_last_of_type() and self.display_type == u'primary': - self.display_type = u'secondary' - elif self.is_last_of_type() and self.display_type == u'secondary': - self.display_type = u'tertiary' + if self.is_last_of_type() and self.display_type == 'primary': + self.display_type = 'secondary' + elif self.is_last_of_type() and self.display_type == 'secondary': + self.display_type = 'tertiary' self.save() def promote(self): - if self.is_first_of_type() and self.display_type == u'secondary': - self.display_type = u'primary' - elif self.is_first_of_type() and self.display_type == u'tertiary': - self.display_type = u'secondary' + if self.is_first_of_type() and self.display_type == 'secondary': + self.display_type = 'primary' + elif self.is_first_of_type() and self.display_type == 'tertiary': + self.display_type = 'secondary' self.save() def is_first_of_type(self): diff --git a/mediagoblin/plugins/archivalook/tools.py b/mediagoblin/plugins/archivalook/tools.py index ad2eee5f..47eec7dc 100644 --- a/mediagoblin/plugins/archivalook/tools.py +++ b/mediagoblin/plugins/archivalook/tools.py @@ -56,7 +56,7 @@ def parse_url(url): who uploaded the piece of media, slug is the media entry's url slug. """ - url = six.text_type(url) + url = str(url) u_end, m_start, m_end, end = (url.find('/u/') + 3, url.find('/m/'), url.find('/m/') + 3, @@ -87,14 +87,14 @@ def split_featured_media_list(featured_media): or tertiary) """ - featured_media = six.text_type(featured_media) + featured_media = str(featured_media) featured_media_list = featured_media.split("\n") display_type = 0 media_already_featured = [] all_featured_media = [] for line in featured_media_list: if line == '' or line.isspace(): continue - elif line.startswith(u'-'): + elif line.startswith('-'): display_type += 1 elif display_type <= 0 or display_type > 3: continue else: @@ -106,9 +106,9 @@ def split_featured_media_list(featured_media): media_already_featured.append(media) all_featured_media.append((media, [None, - u'primary', - u'secondary', - u'tertiary'][display_type])) + 'primary', + 'secondary', + 'tertiary'][display_type])) return all_featured_media @@ -123,24 +123,24 @@ def create_featured_media_textbox(): primaries = FeaturedMedia.query.order_by( FeaturedMedia.order.asc()).filter( - FeaturedMedia.display_type == u'primary').all() + FeaturedMedia.display_type == 'primary').all() secondaries = FeaturedMedia.query.order_by( FeaturedMedia.order.asc()).filter( - FeaturedMedia.display_type == u'secondary').all() + FeaturedMedia.display_type == 'secondary').all() tertiaries = FeaturedMedia.query.order_by( FeaturedMedia.order.asc()).filter( - FeaturedMedia.display_type == u'tertiary').all() - output_text = u'' + FeaturedMedia.display_type == 'tertiary').all() + output_text = '' for display_type, feature_list in [ - (_(u'Primary'),primaries), - (_(u'Secondary'),secondaries), - (_(u'Tertiary'),tertiaries)]: + (_('Primary'),primaries), + (_('Secondary'),secondaries), + (_('Tertiary'),tertiaries)]: output_text += _( - u"""-----------{display_type}-Features--------------------------- + """-----------{display_type}-Features--------------------------- """).format(display_type=display_type) for feature in feature_list: media_entry = feature.media_entry - output_text += u'/u/{uploader_username}/m/{media_slug}/\n'.format( + output_text += '/u/{uploader_username}/m/{media_slug}/\n'.format( uploader_username = media_entry.get_actor.username, media_slug = media_entry.slug) @@ -164,9 +164,9 @@ def automatically_add_new_feature(media_entry): # secondary features, but in the future this should be a variable editable # by the site admin. too_many_primaries = FeaturedMedia.query.filter( - FeaturedMedia.display_type==u'primary').count() >= 1 + FeaturedMedia.display_type=='primary').count() >= 1 too_many_secondaries = FeaturedMedia.query.filter( - FeaturedMedia.display_type==u'secondary').count() >= 2 + FeaturedMedia.display_type=='secondary').count() >= 2 featured_first_to_last = FeaturedMedia.query.order_by( FeaturedMedia.order.asc()).all() @@ -174,11 +174,11 @@ def automatically_add_new_feature(media_entry): # Some features have the option to demote or promote themselves to a # different display_type, based on their position. But all features move # up and down one step in the stack. - if (feature.is_last_of_type() and feature.display_type == u'primary' + if (feature.is_last_of_type() and feature.display_type == 'primary' and too_many_primaries): feature.demote() too_many_primaries = False - elif (feature.is_last_of_type() and feature.display_type == u'secondary' + elif (feature.is_last_of_type() and feature.display_type == 'secondary' and too_many_secondaries): feature.demote() too_many_secondaries = False @@ -188,7 +188,7 @@ def automatically_add_new_feature(media_entry): # Create the new feature at the top of the stack. new_feature = FeaturedMedia( media_entry=media_entry, - display_type=u"primary", + display_type="primary", order=0) new_feature.save() return new_feature @@ -252,10 +252,10 @@ def promote_feature(media_entry): target_feature.display_type) above_feature.save() # Change the feature's display type to a more prominent one - elif target_feature.display_type == u'secondary': - target_feature.display_type = u'primary' - elif target_feature.display_type == u'tertiary': - target_feature.display_type = u'secondary' + elif target_feature.display_type == 'secondary': + target_feature.display_type = 'primary' + elif target_feature.display_type == 'tertiary': + target_feature.display_type = 'secondary' target_feature.save() def demote_feature(media_entry): @@ -287,8 +287,8 @@ def demote_feature(media_entry): target_feature.display_type) below_feature.save() # Change the feature's display type to a less prominent one - elif target_feature.display_type == u'secondary': - target_feature.display_type = u'tertiary' - elif target_feature.display_type == u'primary': - target_feature.display_type = u'secondary' + elif target_feature.display_type == 'secondary': + target_feature.display_type = 'tertiary' + elif target_feature.display_type == 'primary': + target_feature.display_type = 'secondary' target_feature.save() diff --git a/mediagoblin/plugins/archivalook/views.py b/mediagoblin/plugins/archivalook/views.py index 72424cfc..ca832a5c 100644 --- a/mediagoblin/plugins/archivalook/views.py +++ b/mediagoblin/plugins/archivalook/views.py @@ -40,15 +40,15 @@ def root_view(request): displaying featured media. """ featured_media = { - u'primary':FeaturedMedia.query.order_by( + 'primary':FeaturedMedia.query.order_by( FeaturedMedia.order.asc()).filter( - FeaturedMedia.display_type==u'primary').all(), - u'secondary':FeaturedMedia.query.order_by( + FeaturedMedia.display_type=='primary').all(), + 'secondary':FeaturedMedia.query.order_by( FeaturedMedia.order.asc()).filter( - FeaturedMedia.display_type==u'secondary').all(), - u'tertiary':FeaturedMedia.query.order_by( + FeaturedMedia.display_type=='secondary').all(), + 'tertiary':FeaturedMedia.query.order_by( FeaturedMedia.order.asc()).filter( - FeaturedMedia.display_type==u'tertiary').all()} + FeaturedMedia.display_type=='tertiary').all()} return render_to_response( request, 'archivalook/root.html', @@ -56,7 +56,7 @@ def root_view(request): 'allow_registration': mg_globals.app_config["allow_registration"], 'feature_template': feature_template}) -@user_has_privilege(u'featurer') +@user_has_privilege('featurer') def featured_media_panel(request): """ This is a new administrator panel to manage featured media. This is an @@ -99,7 +99,7 @@ def recent_media_gallery_view(request, page): """ The replaced homepage is available through this view. """ - cursor = MediaEntry.query.filter_by(state=u'processed').\ + cursor = MediaEntry.query.filter_by(state='processed').\ order_by(MediaEntry.created.desc()) pagination = Pagination(page, cursor) @@ -117,7 +117,7 @@ def add_featured_media_to_media_home(context): context['featured_media'] = FeaturedMedia.query return context -@user_has_privilege(u'featurer') +@user_has_privilege('featurer') @get_user_media_entry def feature_media(request, media, **kwargs): """ @@ -130,7 +130,7 @@ def feature_media(request, media, **kwargs): return redirect( request, 'index') -@user_has_privilege(u'featurer') +@user_has_privilege('featurer') @get_user_media_entry def unfeature_media(request, media, **kwargs): """ @@ -143,7 +143,7 @@ def unfeature_media(request, media, **kwargs): return redirect( request, 'index') -@user_has_privilege(u'featurer') +@user_has_privilege('featurer') @get_user_media_entry def promote_featured_media(request, media, **kwargs): """ @@ -156,7 +156,7 @@ def promote_featured_media(request, media, **kwargs): return redirect( request, 'index') -@user_has_privilege(u'featurer') +@user_has_privilege('featurer') @get_user_media_entry def demote_featured_media(request, media, **kwargs): """ diff --git a/mediagoblin/plugins/basic_auth/tools.py b/mediagoblin/plugins/basic_auth/tools.py index 13f240b2..ad3cb1b0 100644 --- a/mediagoblin/plugins/basic_auth/tools.py +++ b/mediagoblin/plugins/basic_auth/tools.py @@ -40,7 +40,7 @@ def bcrypt_check_password(raw_pass, stored_hash, extra_salt=None): True or False depending on success. """ if extra_salt: - raw_pass = u"%s:%s" % (extra_salt, raw_pass) + raw_pass = "{}:{}".format(extra_salt, raw_pass) hashed_pass = bcrypt.hashpw(raw_pass.encode('utf-8'), stored_hash) @@ -66,9 +66,9 @@ def bcrypt_gen_password_hash(raw_pass, extra_salt=None): non-database extra salt """ if extra_salt: - raw_pass = u"%s:%s" % (extra_salt, raw_pass) + raw_pass = "{}:{}".format(extra_salt, raw_pass) - return six.text_type( + return str( bcrypt.hashpw(raw_pass.encode('utf-8'), bcrypt.gensalt())) @@ -92,8 +92,8 @@ def fake_login_attempt(): EMAIL_FP_VERIFICATION_TEMPLATE = ( - u"{uri}?" - u"token={fp_verification_key}") + "{uri}?" + "token={fp_verification_key}") def send_fp_verification_email(user, request): diff --git a/mediagoblin/plugins/basic_auth/views.py b/mediagoblin/plugins/basic_auth/views.py index f398f0d2..9433b22d 100644 --- a/mediagoblin/plugins/basic_auth/views.py +++ b/mediagoblin/plugins/basic_auth/views.py @@ -70,7 +70,7 @@ def forgot_password(request): success_message = _("An email has been sent with instructions " "on how to change your password.") - if user and user.has_privilege(u'active') is False: + if user and user.has_privilege('active') is False: # Don't send reminder because user is inactive or has no verified email messages.add_message( request, @@ -128,7 +128,7 @@ def verify_forgot_password(request): request, 'index') # check if user active and has email verified - if user.has_privilege(u'active'): + if user.has_privilege('active'): cp_form = forms.ChangeForgotPassForm(formdata_vars) if request.method == 'POST' and cp_form.validate(): diff --git a/mediagoblin/plugins/flatpagesfile/__init__.py b/mediagoblin/plugins/flatpagesfile/__init__.py index 3d797809..5f267f07 100644 --- a/mediagoblin/plugins/flatpagesfile/__init__.py +++ b/mediagoblin/plugins/flatpagesfile/__init__.py @@ -34,7 +34,7 @@ _log = logging.getLogger(__name__) def print_context(c): s = [] for key, val in c.items(): - s.append('%s: %s' % (key, repr(val))) + s.append('{}: {}'.format(key, repr(val))) return '\n'.join(s) diff --git a/mediagoblin/plugins/httpapiauth/__init__.py b/mediagoblin/plugins/httpapiauth/__init__.py index d7180463..505cea5d 100644 --- a/mediagoblin/plugins/httpapiauth/__init__.py +++ b/mediagoblin/plugins/httpapiauth/__init__.py @@ -42,7 +42,7 @@ class HTTPAuth(Auth): if not request.authorization: return False - user = check_login_simple(six.text_type(request.authorization['username']), + user = check_login_simple(str(request.authorization['username']), request.authorization['password']) if user: diff --git a/mediagoblin/plugins/ldap/tools.py b/mediagoblin/plugins/ldap/tools.py index 9d6d8b2a..89ac8c11 100644 --- a/mediagoblin/plugins/ldap/tools.py +++ b/mediagoblin/plugins/ldap/tools.py @@ -23,12 +23,12 @@ from mediagoblin.tools import pluginapi _log = logging.getLogger(__name__) -class LDAP(object): +class LDAP: def __init__(self): self.ldap_settings = pluginapi.get_config('mediagoblin.plugins.ldap') def _connect(self, server): - _log.info('Connecting to {0}.'.format(server['LDAP_SERVER_URI'])) + _log.info('Connecting to {}.'.format(server['LDAP_SERVER_URI'])) self.conn = ldap.initialize(server['LDAP_SERVER_URI']) if server['LDAP_START_TLS'] == 'true': @@ -38,7 +38,7 @@ class LDAP(object): def _get_email(self, server, username): try: results = self.conn.search_s(server['LDAP_SEARCH_BASE'], - ldap.SCOPE_SUBTREE, 'uid={0}' + ldap.SCOPE_SUBTREE, 'uid={}' .format(username), [server['EMAIL_SEARCH_FIELD']]) @@ -49,7 +49,7 @@ class LDAP(object): return email def login(self, username, password): - for k, v in six.iteritems(self.ldap_settings): + for k, v in self.ldap_settings.items(): try: self._connect(v) user_dn = v['LDAP_USER_DN_TEMPLATE'].format(username=username) @@ -61,7 +61,7 @@ class LDAP(object): _log.info(e) finally: - _log.info('Unbinding {0}.'.format(v['LDAP_SERVER_URI'])) + _log.info('Unbinding {}.'.format(v['LDAP_SERVER_URI'])) self.conn.unbind() return False, None diff --git a/mediagoblin/plugins/ldap/views.py b/mediagoblin/plugins/ldap/views.py index e10c7f60..99ecb456 100644 --- a/mediagoblin/plugins/ldap/views.py +++ b/mediagoblin/plugins/ldap/views.py @@ -44,7 +44,7 @@ def login(request): if user: # set up login in session - request.session['user_id'] = six.text_type(user.id) + request.session['user_id'] = str(user.id) request.session.save() if request.form.get('next'): diff --git a/mediagoblin/plugins/metadata_display/lib.py b/mediagoblin/plugins/metadata_display/lib.py index c00bb0f6..5590b1fd 100644 --- a/mediagoblin/plugins/metadata_display/lib.py +++ b/mediagoblin/plugins/metadata_display/lib.py @@ -19,11 +19,11 @@ def rdfa_to_readable(rdfa_predicate): A simple script to convert rdfa resource descriptors into a form more accessible for humans. """ - components = rdfa_predicate.split(u":") + components = rdfa_predicate.split(":") if len(components) >= 2: readable = components[1].capitalize() else: - readable = u"" + readable = "" return readable def add_rdfa_to_readable_to_media_home(context): diff --git a/mediagoblin/plugins/openid/models.py b/mediagoblin/plugins/openid/models.py index 6773f0ad..e51b401c 100644 --- a/mediagoblin/plugins/openid/models.py +++ b/mediagoblin/plugins/openid/models.py @@ -41,7 +41,7 @@ class Nonce(Base): salt = Column(Unicode, primary_key=True) def __unicode__(self): - return u'Nonce: %r, %r' % (self.server_url, self.salt) + return 'Nonce: {!r}, {!r}'.format(self.server_url, self.salt) class Association(Base): @@ -55,7 +55,7 @@ class Association(Base): assoc_type = Column(Unicode) def __unicode__(self): - return u'Association: %r, %r' % (self.server_url, self.handle) + return 'Association: {!r}, {!r}'.format(self.server_url, self.handle) MODELS = [ diff --git a/mediagoblin/plugins/openid/store.py b/mediagoblin/plugins/openid/store.py index 24726814..dd794786 100644 --- a/mediagoblin/plugins/openid/store.py +++ b/mediagoblin/plugins/openid/store.py @@ -36,12 +36,12 @@ class SQLAlchemyOpenIDStore(OpenIDStore): if not assoc: assoc = Association() - assoc.server_url = six.text_type(server_url) + assoc.server_url = str(server_url) assoc.handle = association.handle # django uses base64 encoding, python-openid uses a blob field for # secret - assoc.secret = six.text_type(base64.encodestring(association.secret)) + assoc.secret = str(base64.encodestring(association.secret)) assoc.issued = association.issued assoc.lifetime = association.lifetime assoc.assoc_type = association.assoc_type diff --git a/mediagoblin/plugins/openid/views.py b/mediagoblin/plugins/openid/views.py index 71f444fa..03dee7d4 100644 --- a/mediagoblin/plugins/openid/views.py +++ b/mediagoblin/plugins/openid/views.py @@ -189,7 +189,7 @@ def finish_login(request): if user: # Set up login in session - request.session['user_id'] = six.text_type(user.id) + request.session['user_id'] = str(user.id) request.session.save() if request.session.get('next'): diff --git a/mediagoblin/plugins/persona/views.py b/mediagoblin/plugins/persona/views.py index 41d38353..3f1f1afb 100644 --- a/mediagoblin/plugins/persona/views.py +++ b/mediagoblin/plugins/persona/views.py @@ -65,7 +65,7 @@ def login(request): user = query.user if query else None if user: - request.session['user_id'] = six.text_type(user.id) + request.session['user_id'] = str(user.id) request.session['persona_login_email'] = email request.session.save() diff --git a/mediagoblin/plugins/piwigo/tools.py b/mediagoblin/plugins/piwigo/tools.py index 7b9b7af3..7b3e931a 100644 --- a/mediagoblin/plugins/piwigo/tools.py +++ b/mediagoblin/plugins/piwigo/tools.py @@ -47,9 +47,9 @@ class PwgNamedArray(list): def _fill_element_dict(el, data, as_attr=()): - for k, v in six.iteritems(data): + for k, v in data.items(): if k in as_attr: - if not isinstance(v, six.string_types): + if not isinstance(v, str): v = str(v) el.set(k, v) else: @@ -63,7 +63,7 @@ def _fill_element(el, data): el.text = "1" else: el.text = "0" - elif isinstance(data, six.string_types): + elif isinstance(data, str): el.text = data elif isinstance(data, int): el.text = str(data) @@ -92,7 +92,7 @@ def response_xml(result): mimetype='text/xml', status=status) -class CmdTable(object): +class CmdTable: _cmd_table = {} def __init__(self, cmd_name, only_post=False): @@ -131,11 +131,11 @@ def check_form(form): raise BadRequest() dump = [] for f in form: - dump.append("%s=%r" % (f.name, f.data)) + dump.append("{}={!r}".format(f.name, f.data)) _log.debug("form: %s", " ".join(dump)) -class PWGSession(object): +class PWGSession: session_manager = None def __init__(self, request): diff --git a/mediagoblin/plugins/piwigo/views.py b/mediagoblin/plugins/piwigo/views.py index 30c7ffa2..ecc7054e 100644 --- a/mediagoblin/plugins/piwigo/views.py +++ b/mediagoblin/plugins/piwigo/views.py @@ -121,7 +121,7 @@ def pwg_images_addSimple(request): raise BadRequest() dump = [] for f in form: - dump.append("%s=%r" % (f.name, f.data)) + dump.append("{}={!r}".format(f.name, f.data)) _log.info("addSimple: %r %s %r", request.form, " ".join(dump), request.files) @@ -133,8 +133,8 @@ def pwg_images_addSimple(request): mg_app=request.app, user=request.user, submitted_file=request.files['image'], filename=request.files['image'].filename, - title=six.text_type(form.name.data), - description=six.text_type(form.comment.data)) + title=str(form.name.data), + description=str(form.comment.data)) collection_id = form.category.data if collection_id > 0: @@ -151,7 +151,7 @@ def pwg_images_addSimple(request): # Handle upload limit issues except FileUploadLimit: raise BadRequest( - _(u'Sorry, the file size is too big.')) + _('Sorry, the file size is too big.')) except UserUploadLimit: raise BadRequest( _('Sorry, uploading this file will put you over your' diff --git a/mediagoblin/plugins/processing_info/__init__.py b/mediagoblin/plugins/processing_info/__init__.py index fb824765..db6eeb0c 100644 --- a/mediagoblin/plugins/processing_info/__init__.py +++ b/mediagoblin/plugins/processing_info/__init__.py @@ -37,10 +37,10 @@ def make_stats(context): user = request.user if user: num_queued = MediaEntry.query.filter_by( - actor=user.id, state=u'processing').count() + actor=user.id, state='processing').count() context['num_queued'] = num_queued num_failed = MediaEntry.query.filter_by( - actor=user.id, state=u'failed').count() + actor=user.id, state='failed').count() context['num_failed'] = num_failed return context diff --git a/mediagoblin/plugins/raven/__init__.py b/mediagoblin/plugins/raven/__init__.py index 8cfaed0a..439d34c7 100644 --- a/mediagoblin/plugins/raven/__init__.py +++ b/mediagoblin/plugins/raven/__init__.py @@ -31,11 +31,11 @@ def get_client(): client = None if sentry_dsn: - _log.info('Setting up raven from plugin config: {0}'.format( + _log.info('Setting up raven from plugin config: {}'.format( sentry_dsn)) client = Client(sentry_dsn) elif os.environ.get('SENTRY_DSN'): - _log.info('Setting up raven from SENTRY_DSN environment variable: {0}'\ + _log.info('Setting up raven from SENTRY_DSN environment variable: {}'\ .format(os.environ.get('SENTRY_DSN'))) client = Client() # Implicitly looks for SENTRY_DSN diff --git a/mediagoblin/plugins/subtitles/views.py b/mediagoblin/plugins/subtitles/views.py index e3375306..7ca45329 100644 --- a/mediagoblin/plugins/subtitles/views.py +++ b/mediagoblin/plugins/subtitles/views.py @@ -57,7 +57,7 @@ def edit_subtitles(request, media): if mimetypes.guess_type( request.files['subtitle_file'].filename)[0] in \ UNSAFE_MIMETYPES: - public_filename = secure_filename('{0}.notsafe'.format( + public_filename = secure_filename('{}.notsafe'.format( request.files['subtitle_file'].filename)) else: public_filename = secure_filename( @@ -72,7 +72,7 @@ def edit_subtitles(request, media): return redirect(request, location=media.url_for_self(request.urlgen)) subtitle_public_filepath = mg_globals.public_store.get_unique_filepath( - ['media_entries', six.text_type(media.id), 'subtitle', + ['media_entries', str(media.id), 'subtitle', public_filename]) with mg_globals.public_store.get_file( diff --git a/mediagoblin/plugins/trim_whitespace/__init__.py b/mediagoblin/plugins/trim_whitespace/__init__.py index 3da1e8b4..6f67218c 100644 --- a/mediagoblin/plugins/trim_whitespace/__init__.py +++ b/mediagoblin/plugins/trim_whitespace/__init__.py @@ -13,7 +13,6 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from __future__ import unicode_literals import logging import re @@ -23,7 +22,7 @@ _log = logging.getLogger(__name__) class TrimWhiteSpaceMeddleware(meddleware.BaseMeddleware): _setup_plugin_called = 0 - RE_MULTI_WHITESPACE = re.compile(b'(\s)\s+', re.M) + RE_MULTI_WHITESPACE = re.compile(br'(\s)\s+', re.M) def process_response(self, request, response): """Perform very naive html tidying by removing multiple whitespaces""" @@ -65,7 +64,7 @@ class TrimWhiteSpaceMeddleware(meddleware.BaseMeddleware): # Append ourselves to the list of enabled Meddlewares meddleware.ENABLED_MEDDLEWARE.append( - '{0}:{1}'.format(cls.__module__, cls.__name__)) + '{}:{}'.format(cls.__module__, cls.__name__)) hooks = { |