Fix import errors in plugins

Fix #178

diff --git a/plugins/m/alias.py b/plugins/m/alias.py
index 3e793087411ba5495983c976b1a7b915c36116e2..8be26e23643e9053fef79ac0839d6f674ffcfdf4 100644 (file)
--- 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 66d25e685eabcbf51d0de978dc1e84393ae5265c..10593178c2331842bfae2fed648f999e923ee160 100644 (file)
--- 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 366eb7a49ccf8d770e477334514d665393c69357..4a3a2324f2482f415cab922f7564b702e216494c 100644 (file)
--- 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 4a0bca79186cb5cf7a4a292bae6693efb3efe8df..eecc400095f4325496201210e287c60e03dfa4ad 100644 (file)
--- 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 4b29ec80b6ef0fef62d007be2055b7ed54c275a7..06ec1a45514319b4c8ccbc119ad898136804ec3c 100644 (file)
--- 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 37ce0880829214077e366b5767318f945a076ba8..987c56ca93ea73bfd09c2d2a3b0be6acecb85c60 100644 (file)
--- 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 1f2fad66a19104e25c369f75c81d79c09c0dcba2..a27e4c787e0105ab581d69da4826e0034c5994be 100644 (file)
--- 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 05a35d3fbf46875f5e0df598da2c0d1bd5ba37d8..1dd7ae70ff3443e3e6d547814ac2d75b29ec2060 100644 (file)
--- 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 df8fea467e7ba0f27c93bf6e2876483e4b11ee99..15b23879d24d775cfb174c4201435636c7b3da21 100644 (file)
--- 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 da8d03545ddd37c7dde8e52f17bd1c9b63c53e05..8ec5f6084d01fc69bd5054aceb98cdcdff63fd1f 100755 (executable)
--- 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([