From 58edad6897931f21c7c2f4314cfab33c2b167680 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Sun, 1 Dec 2019 18:14:13 +0300
Subject: [PATCH] remove pelican.signals in favor of pelican.plugins.signals

---
 pelican/__init__.py            | 8 ++++----
 pelican/contents.py            | 2 +-
 pelican/generators.py          | 2 +-
 pelican/readers.py             | 2 +-
 pelican/signals.py             | 4 ----
 pelican/tests/test_contents.py | 2 +-
 pelican/writers.py             | 2 +-
 7 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 pelican/signals.py

diff --git a/pelican/__init__.py b/pelican/__init__.py
index 3dd04ce8..17f4f922 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -18,10 +18,10 @@ __path__ = extend_path(__path__, __name__)
 # pelican.log has to be the first pelican module to be loaded
 # because logging.setLoggerClass has to be called before logging.getLogger
 from pelican.log import init as init_logging
-from pelican import signals  # noqa
-from pelican.generators import (ArticlesGenerator, PagesGenerator,
-                                SourceFileGenerator, StaticGenerator,
-                                TemplatePagesGenerator)
+from pelican.generators import (ArticlesGenerator,  # noqa: I100
+                                PagesGenerator, SourceFileGenerator,
+                                StaticGenerator, TemplatePagesGenerator)
+from pelican.plugins import signals
 from pelican.plugins._utils import load_plugins
 from pelican.readers import Readers
 from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
diff --git a/pelican/contents.py b/pelican/contents.py
index 6edf5152..594cd3b5 100644
--- a/pelican/contents.py
+++ b/pelican/contents.py
@@ -10,7 +10,7 @@ from urllib.parse import urljoin, urlparse, urlunparse
 
 import pytz
 
-from pelican import signals
+from pelican.plugins import signals
 from pelican.settings import DEFAULT_CONFIG
 from pelican.utils import (deprecated_attribute, memoized, path_to_url,
                            posixize_path, sanitised_join, set_date_tzinfo,
diff --git a/pelican/generators.py b/pelican/generators.py
index 8bd2656f..02667cd7 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -13,9 +13,9 @@ from operator import attrgetter
 from jinja2 import (BaseLoader, ChoiceLoader, Environment, FileSystemLoader,
                     PrefixLoader, TemplateNotFound)
 
-from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Article, Page, Static
+from pelican.plugins import signals
 from pelican.readers import Readers
 from pelican.utils import (DateFormatter, copy, mkdir_p, order_content,
                            posixize_path, process_translations)
diff --git a/pelican/readers.py b/pelican/readers.py
index b26bd381..673b637e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -16,9 +16,9 @@ from docutils.parsers.rst.languages import get_language as get_docutils_lang
 from docutils.writers.html4css1 import HTMLTranslator, Writer
 
 from pelican import rstdirectives  # NOQA
-from pelican import signals
 from pelican.cache import FileStampDataCacher
 from pelican.contents import Author, Category, Page, Tag
+from pelican.plugins import signals
 from pelican.utils import get_date, pelican_open, posixize_path
 
 try:
diff --git a/pelican/signals.py b/pelican/signals.py
deleted file mode 100644
index f7605f0c..00000000
--- a/pelican/signals.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# This file is for backwards compatibility
-
-from pelican.plugins.signals import * # noqa
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 256f08bb..62608b7b 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -10,8 +10,8 @@ from sys import platform
 from jinja2.utils import generate_lorem_ipsum
 
 from pelican.contents import Article, Author, Category, Page, Static
+from pelican.plugins.signals import content_object_init
 from pelican.settings import DEFAULT_CONFIG
-from pelican.signals import content_object_init
 from pelican.tests.support import (LoggedTestCase, get_context, get_settings,
                                    unittest)
 from pelican.utils import (path_to_url, posixize_path, truncate_html_words)
diff --git a/pelican/writers.py b/pelican/writers.py
index daeb9dec..7bbd216e 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -8,8 +8,8 @@ from feedgenerator import Atom1Feed, Rss201rev2Feed, get_tag_uri
 
 from jinja2 import Markup
 
-from pelican import signals
 from pelican.paginator import Paginator
+from pelican.plugins import signals
 from pelican.utils import (get_relative_path, is_selected_for_writing,
                            path_to_url, sanitised_join, set_date_tzinfo)