From: shniubobo Date: Sat, 10 Oct 2020 17:57:01 +0000 (+0800) Subject: Fix import errors in plugins X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=dbda4b6d4e4e79cab71ed4e1471b00ac7c3d7aa3;p=blog.git Fix import errors in plugins Fix #178 --- diff --git a/plugins/m/alias.py b/plugins/m/alias.py index 3e793087..8be26e23 100644 --- a/plugins/m/alias.py +++ b/plugins/m/alias.py @@ -74,6 +74,6 @@ def register_mcss(**kwargs): def _pelican_get_generators(generators): return AliasGenerator def register(): # for Pelican - import pelican.signals + from pelican import signals - pelican.signals.get_generators.connect(_pelican_get_generators) + signals.get_generators.connect(_pelican_get_generators) diff --git a/plugins/m/code.py b/plugins/m/code.py index 66d25e68..10593178 100644 --- a/plugins/m/code.py +++ b/plugins/m/code.py @@ -323,6 +323,6 @@ def _pelican_configure(pelicanobj): register_mcss(mcss_settings=settings) def register(): # for Pelican - import pelican.signals + from pelican import signals - pelican.signals.initialized.connect(_pelican_configure) + signals.initialized.connect(_pelican_configure) diff --git a/plugins/m/dot.py b/plugins/m/dot.py index 366eb7a4..4a3a2324 100644 --- a/plugins/m/dot.py +++ b/plugins/m/dot.py @@ -117,6 +117,6 @@ def _pelican_configure(pelicanobj): register_mcss(mcss_settings=pelicanobj.settings) def register(): # for Pelican - import pelican.signals + from pelican import signals - pelican.signals.initialized.connect(_pelican_configure) + signals.initialized.connect(_pelican_configure) diff --git a/plugins/m/dox.py b/plugins/m/dox.py index 4a0bca79..eecc4000 100644 --- a/plugins/m/dox.py +++ b/plugins/m/dox.py @@ -187,6 +187,6 @@ def _pelican_configure(pelicanobj): register_mcss(mcss_settings=settings) def register(): # for Pelican - import pelican.signals + from pelican import signals - pelican.signals.initialized.connect(_pelican_configure) + signals.initialized.connect(_pelican_configure) diff --git a/plugins/m/filesize.py b/plugins/m/filesize.py index 4b29ec80..06ec1a45 100644 --- a/plugins/m/filesize.py +++ b/plugins/m/filesize.py @@ -75,6 +75,6 @@ def _pelican_configure(pelicanobj): register_mcss(mcss_settings=settings) def register(): # for Pelican - import pelican.signals + from pelican import signals - pelican.signals.initialized.connect(_pelican_configure) + signals.initialized.connect(_pelican_configure) diff --git a/plugins/m/htmlsanity.py b/plugins/m/htmlsanity.py index 37ce0880..987c56ca 100644 --- a/plugins/m/htmlsanity.py +++ b/plugins/m/htmlsanity.py @@ -730,7 +730,7 @@ def register_mcss(mcss_settings, jinja_environment, **kwargs): # Below is only Pelican-specific functionality. If Pelican is not found, these # do nothing. try: - import pelican.signals + from pelican import signals from pelican.readers import RstReader class PelicanSaneRstReader(RstReader): @@ -800,5 +800,5 @@ def _pelican_add_reader(readers): readers.reader_classes['rst'] = PelicanSaneRstReader def register(): # for Pelican - pelican.signals.initialized.connect(_pelican_configure) - pelican.signals.readers_init.connect(_pelican_add_reader) + signals.initialized.connect(_pelican_configure) + signals.readers_init.connect(_pelican_add_reader) diff --git a/plugins/m/images.py b/plugins/m/images.py index 1f2fad66..a27e4c78 100644 --- a/plugins/m/images.py +++ b/plugins/m/images.py @@ -309,6 +309,6 @@ def _pelican_configure(pelicanobj): register_mcss(mcss_settings=settings) def register(): # for Pelican - import pelican.signals + from pelican import signals - pelican.signals.initialized.connect(_pelican_configure) + signals.initialized.connect(_pelican_configure) diff --git a/plugins/m/math.py b/plugins/m/math.py index 05a35d3f..1dd7ae70 100644 --- a/plugins/m/math.py +++ b/plugins/m/math.py @@ -164,8 +164,8 @@ def _configure_pelican(pelicanobj): register_mcss(mcss_settings=pelicanobj.settings, hooks_pre_page=[], hooks_post_run=[]) def register(): - import pelican.signals + from pelican import signals - pelican.signals.initialized.connect(_configure_pelican) - pelican.signals.finalized.connect(save_cache) - pelican.signals.content_object_init.connect(new_page) + signals.initialized.connect(_configure_pelican) + signals.finalized.connect(save_cache) + signals.content_object_init.connect(new_page) diff --git a/plugins/m/plots.py b/plugins/m/plots.py index df8fea46..15b23879 100644 --- a/plugins/m/plots.py +++ b/plugins/m/plots.py @@ -309,7 +309,7 @@ def _pelican_configure(pelicanobj): register_mcss(mcss_settings=pelicanobj.settings, hooks_pre_page=[]) def register(): # for Pelican - import pelican.signals + from pelican import signals - pelican.signals.initialized.connect(_pelican_configure) - pelican.signals.content_object_init.connect(new_page) + signals.initialized.connect(_pelican_configure) + signals.content_object_init.connect(new_page) diff --git a/plugins/m/sphinx.py b/plugins/m/sphinx.py index da8d0354..8ec5f608 100755 --- a/plugins/m/sphinx.py +++ b/plugins/m/sphinx.py @@ -658,13 +658,13 @@ def _pelican_configure(pelicanobj): inventories=pelicanobj.settings.get('M_SPHINX_INVENTORIES', [])) def register(): # for Pelican - import pelican.signals + from pelican import signals rst.roles.register_local_role('ref', ref) - pelican.signals.initialized.connect(_pelican_configure) - pelican.signals.article_generator_preread.connect(_pelican_new_page) - pelican.signals.page_generator_preread.connect(_pelican_new_page) + signals.initialized.connect(_pelican_configure) + signals.article_generator_preread.connect(_pelican_new_page) + signals.page_generator_preread.connect(_pelican_new_page) def pretty_print_intersphinx_inventory(file): return ''.join([