diff options
Diffstat (limited to 'mediagoblin/init')
| -rw-r--r-- | mediagoblin/init/__init__.py | 6 | ||||
| -rw-r--r-- | mediagoblin/init/celery/__init__.py | 8 | ||||
| -rw-r--r-- | mediagoblin/init/celery/from_celery.py | 4 | ||||
| -rw-r--r-- | mediagoblin/init/config.py | 10 |
4 files changed, 14 insertions, 14 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index 05a26792..e314c20d 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -112,8 +112,8 @@ def get_jinja_loader(user_template_path=None, current_theme=None, # Add plugin template paths next--takes precedence over # core templates. if plugin_template_paths is not None: - path_list.extend((jinja2.FileSystemLoader(path) - for path in plugin_template_paths)) + path_list.extend(jinja2.FileSystemLoader(path) + for path in plugin_template_paths) # Add core templates last. path_list.append(jinja2.PackageLoader('mediagoblin', 'templates')) @@ -133,7 +133,7 @@ def get_staticdirector(app_config): # Let plugins load additional paths for plugin_static in hook_runall("static_setup"): - direct_domains[plugin_static.name] = "%s/%s" % ( + direct_domains[plugin_static.name] = "{}/{}".format( app_config['plugin_web_path'].rstrip('/'), plugin_static.name) diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py index 9fb783bd..26f7cb61 100644 --- a/mediagoblin/init/celery/__init__.py +++ b/mediagoblin/init/celery/__init__.py @@ -58,7 +58,7 @@ def get_celery_settings_dict(app_config, global_config, celery_settings = {} # Add all celery settings from config - for key, value in six.iteritems(celery_conf): + for key, value in celery_conf.items(): celery_settings[key] = value # TODO: use default result stuff here if it exists @@ -122,7 +122,7 @@ def setup_celery_from_config(app_config, global_config, __import__(settings_module) this_module = sys.modules[settings_module] - for key, value in six.iteritems(celery_settings): + for key, value in celery_settings.items(): setattr(this_module, key, value) if set_environ: @@ -132,8 +132,8 @@ def setup_celery_from_config(app_config, global_config, # initiated from celery import current_app - _log.info('Setting celery configuration from object "{0}"'.format( + _log.info('Setting celery configuration from object "{}"'.format( settings_module)) current_app.config_from_object(this_module) - _log.debug('Celery broker host: {0}'.format(current_app.conf['BROKER_HOST'])) + _log.debug('Celery broker host: {}'.format(current_app.conf['BROKER_HOST'])) diff --git a/mediagoblin/init/celery/from_celery.py b/mediagoblin/init/celery/from_celery.py index b395a826..0c80a961 100644 --- a/mediagoblin/init/celery/from_celery.py +++ b/mediagoblin/init/celery/from_celery.py @@ -42,7 +42,7 @@ def setup_logging_from_paste_ini(loglevel, **kw): 'PASTE_CONFIG', logging_conf_file) if not os.path.exists(logging_conf_file): - raise IOError('{0} does not exist. Logging can not be set up.'.format( + raise OSError('{} does not exist. Logging can not be set up.'.format( logging_conf_file)) logging.config.fileConfig(logging_conf_file) @@ -78,7 +78,7 @@ def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME, mgoblin_conf_file = default_conf_file if not os.path.exists(mgoblin_conf_file): - raise IOError( + raise OSError( "MEDIAGOBLIN_CONFIG not set or file does not exist") # By setting the environment variable here we should ensure that diff --git a/mediagoblin/init/config.py b/mediagoblin/init/config.py index 2e22083a..7f9ad32a 100644 --- a/mediagoblin/init/config.py +++ b/mediagoblin/init/config.py @@ -149,7 +149,7 @@ def read_mediagoblin_config(config_path, config_spec_path=CONFIG_SPEC_PATH): return config, validation_result -REPORT_HEADER = u"""\ +REPORT_HEADER = """\ There were validation problems loading this config file: -------------------------------------------------------- """ @@ -173,17 +173,17 @@ def generate_validation_report(config, validation_result): if key is not None: section_list.append(key) else: - section_list.append(u'[missing section]') + section_list.append('[missing section]') - section_string = u':'.join(section_list) + section_string = ':'.join(section_list) if error == False: # We don't care about missing values for now. continue - report.append(u"%s = %s" % (section_string, error)) + report.append("{} = {}".format(section_string, error)) if report: - return REPORT_HEADER + u"\n".join(report) + return REPORT_HEADER + "\n".join(report) else: return None |