From 92cf3754809c442efc434c7e05089076f79812b4 Mon Sep 17 00:00:00 2001
From: Dima Gerasimov <karlicoss@gmail.com>
Date: Wed, 13 May 2020 21:36:19 +0100
Subject: [PATCH] move rss stuff in a separate subpackage

---
 my/{ => rss}/_rss.py      | 0
 my/{rss.py => rss/all.py} | 2 +-
 my/{ => rss}/feedbin.py   | 2 +-
 my/{ => rss}/feedly.py    | 2 +-
 tests/config.py           | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename my/{ => rss}/_rss.py (100%)
 rename my/{rss.py => rss/all.py} (95%)
 rename my/{ => rss}/feedbin.py (94%)
 rename my/{ => rss}/feedly.py (94%)

diff --git a/my/_rss.py b/my/rss/_rss.py
similarity index 100%
rename from my/_rss.py
rename to my/rss/_rss.py
diff --git a/my/rss.py b/my/rss/all.py
similarity index 95%
rename from my/rss.py
rename to my/rss/all.py
index db577f6..a4a27fe 100644
--- a/my/rss.py
+++ b/my/rss/all.py
@@ -17,7 +17,7 @@ def get_all_subscriptions() -> List[Subscription]:
     states.update(feedly.get_states())
     states.update(feedbin.get_states())
     by_url: Dict[str, Subscription] = {}
-    for d, feeds in sorted(states.items()):
+    for _, feeds in sorted(states.items()):
         for f in feeds:
             if f.url not in by_url:
                 by_url[f.url] = f
diff --git a/my/feedbin.py b/my/rss/feedbin.py
similarity index 94%
rename from my/feedbin.py
rename to my/rss/feedbin.py
index 542c7d5..ebffb91 100644
--- a/my/feedbin.py
+++ b/my/rss/feedbin.py
@@ -7,7 +7,7 @@ from my.config import feedbin as config
 from pathlib import Path
 from typing import Sequence
 
-from .core.common import listify, get_files, isoparse
+from ..core.common import listify, get_files, isoparse
 from ._rss import Subscription
 
 
diff --git a/my/feedly.py b/my/rss/feedly.py
similarity index 94%
rename from my/feedly.py
rename to my/rss/feedly.py
index d43facf..3133656 100644
--- a/my/feedly.py
+++ b/my/rss/feedly.py
@@ -7,7 +7,7 @@ from my.config import feedly as config
 from pathlib import Path
 from typing import Sequence
 
-from .core.common import listify, get_files, isoparse
+from ..core.common import listify, get_files, isoparse
 from ._rss import Subscription
 
 
diff --git a/tests/config.py b/tests/config.py
index 523797a..5df0e04 100644
--- a/tests/config.py
+++ b/tests/config.py
@@ -76,7 +76,7 @@ class feedly:
     os.environ['MY_CONFIG'] = str(tmp_path)
 
     # should not raise at least
-    import my.feedly
+    import my.rss.feedly
 
 
 @pytest.fixture