From 5687cf6a623bbdf33df5fbe363346c65c5834ad4 Mon Sep 17 00:00:00 2001
From: Manuel Cortez <manuel@manuelcortez.net>
Date: Wed, 3 Nov 2021 13:00:35 -0600
Subject: [PATCH] Move Twitter buffers to a specific package

---
 src/controller/buffers/twitter/base.py           |  4 ++--
 src/controller/buffers/twitter/trends.py         |  2 +-
 src/wxUI/buffers/__init__.py                     | 12 +-----------
 src/wxUI/buffers/twitter/__init__.py             | 10 ++++++++++
 src/wxUI/buffers/{ => twitter}/base.py           |  0
 src/wxUI/buffers/{ => twitter}/dm.py             |  0
 src/wxUI/buffers/{ => twitter}/events.py         |  0
 src/wxUI/buffers/{ => twitter}/favourites.py     |  0
 src/wxUI/buffers/{ => twitter}/lists.py          |  0
 src/wxUI/buffers/{ => twitter}/people.py         |  0
 src/wxUI/buffers/{ => twitter}/trends.py         |  0
 src/wxUI/buffers/{ => twitter}/tweet_searches.py |  0
 src/wxUI/buffers/{ => twitter}/user_searches.py  |  0
 13 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 src/wxUI/buffers/twitter/__init__.py
 rename src/wxUI/buffers/{ => twitter}/base.py (100%)
 rename src/wxUI/buffers/{ => twitter}/dm.py (100%)
 rename src/wxUI/buffers/{ => twitter}/events.py (100%)
 rename src/wxUI/buffers/{ => twitter}/favourites.py (100%)
 rename src/wxUI/buffers/{ => twitter}/lists.py (100%)
 rename src/wxUI/buffers/{ => twitter}/people.py (100%)
 rename src/wxUI/buffers/{ => twitter}/trends.py (100%)
 rename src/wxUI/buffers/{ => twitter}/tweet_searches.py (100%)
 rename src/wxUI/buffers/{ => twitter}/user_searches.py (100%)

diff --git a/src/controller/buffers/twitter/base.py b/src/controller/buffers/twitter/base.py
index 8da54709..6890bd1c 100644
--- a/src/controller/buffers/twitter/base.py
+++ b/src/controller/buffers/twitter/base.py
@@ -40,9 +40,9 @@ class BaseBuffer(base.Buffer):
         super(BaseBuffer, self).__init__(parent, function, *args, **kwargs)
         log.debug("Initializing buffer %s, account %s" % (name, account,))
         if bufferType != None:
-            self.buffer = getattr(buffers, bufferType)(parent, name)
+            self.buffer = getattr(buffers.twitter, bufferType)(parent, name)
         else:
-            self.buffer = buffers.basePanel(parent, name)
+            self.buffer = buffers.twitter.basePanel(parent, name)
         self.invisible = True
         self.name = name
         self.type = self.buffer.type
diff --git a/src/controller/buffers/twitter/trends.py b/src/controller/buffers/twitter/trends.py
index e3be681d..d09aa5cf 100644
--- a/src/controller/buffers/twitter/trends.py
+++ b/src/controller/buffers/twitter/trends.py
@@ -26,7 +26,7 @@ class TrendsBuffer(base.Buffer):
         self.session = sessionObject
         self.account = account
         self.invisible = True
-        self.buffer = buffers.trendsPanel(parent, name)
+        self.buffer = buffers.twitter.trendsPanel(parent, name)
         self.buffer.account = account
         self.type = self.buffer.type
         self.bind_events()
diff --git a/src/wxUI/buffers/__init__.py b/src/wxUI/buffers/__init__.py
index 2825b5fb..fa9ff8f8 100644
--- a/src/wxUI/buffers/__init__.py
+++ b/src/wxUI/buffers/__init__.py
@@ -1,13 +1,3 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-from .base import basePanel
-from .dm import dmPanel
-from .events import eventsPanel
-from .favourites import favsPanel
-from .lists import listPanel
+from . import twitter
 from .panels import accountPanel, emptyPanel
-from .people import peoplePanel
-from .trends import trendsPanel
-from .tweet_searches import searchPanel
-from .user_searches import searchUsersPanel
diff --git a/src/wxUI/buffers/twitter/__init__.py b/src/wxUI/buffers/twitter/__init__.py
new file mode 100644
index 00000000..91fb04c8
--- /dev/null
+++ b/src/wxUI/buffers/twitter/__init__.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+from .base import basePanel
+from .dm import dmPanel
+from .events import eventsPanel
+from .favourites import favsPanel
+from .lists import listPanel
+from .people import peoplePanel
+from .trends import trendsPanel
+from .tweet_searches import searchPanel
+from .user_searches import searchUsersPanel
diff --git a/src/wxUI/buffers/base.py b/src/wxUI/buffers/twitter/base.py
similarity index 100%
rename from src/wxUI/buffers/base.py
rename to src/wxUI/buffers/twitter/base.py
diff --git a/src/wxUI/buffers/dm.py b/src/wxUI/buffers/twitter/dm.py
similarity index 100%
rename from src/wxUI/buffers/dm.py
rename to src/wxUI/buffers/twitter/dm.py
diff --git a/src/wxUI/buffers/events.py b/src/wxUI/buffers/twitter/events.py
similarity index 100%
rename from src/wxUI/buffers/events.py
rename to src/wxUI/buffers/twitter/events.py
diff --git a/src/wxUI/buffers/favourites.py b/src/wxUI/buffers/twitter/favourites.py
similarity index 100%
rename from src/wxUI/buffers/favourites.py
rename to src/wxUI/buffers/twitter/favourites.py
diff --git a/src/wxUI/buffers/lists.py b/src/wxUI/buffers/twitter/lists.py
similarity index 100%
rename from src/wxUI/buffers/lists.py
rename to src/wxUI/buffers/twitter/lists.py
diff --git a/src/wxUI/buffers/people.py b/src/wxUI/buffers/twitter/people.py
similarity index 100%
rename from src/wxUI/buffers/people.py
rename to src/wxUI/buffers/twitter/people.py
diff --git a/src/wxUI/buffers/trends.py b/src/wxUI/buffers/twitter/trends.py
similarity index 100%
rename from src/wxUI/buffers/trends.py
rename to src/wxUI/buffers/twitter/trends.py
diff --git a/src/wxUI/buffers/tweet_searches.py b/src/wxUI/buffers/twitter/tweet_searches.py
similarity index 100%
rename from src/wxUI/buffers/tweet_searches.py
rename to src/wxUI/buffers/twitter/tweet_searches.py
diff --git a/src/wxUI/buffers/user_searches.py b/src/wxUI/buffers/twitter/user_searches.py
similarity index 100%
rename from src/wxUI/buffers/user_searches.py
rename to src/wxUI/buffers/twitter/user_searches.py