clean utils.py module

leVirve · Jul 15, 2016 · 276110f · 276110f
1 parent a1462ea
commit 276110f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/dcard/forums.py b/dcard/forums.py
@@ -3,15 +3,21 @@
 import logging
 try:
     from dcard import api
-    from dcard.utils import Client, filter_general
+    from dcard.utils import Client
 except ImportError:
     from . import api
-    from .utils import Client, filter_general
+    from .utils import Client
 
 
 logger = logging.getLogger('dcard')
 
 
+def filter_general(forums):
+    for forum in forums:
+        if not forum['isSchool']:
+            yield forum
+
+
 class Forum:
 
     def __init__(self, forum):

diff --git a/dcard/utils.py b/dcard/utils.py
@@ -10,17 +10,9 @@ def __init__(self):
         self.session = FuturesSession(max_workers=10)
 
     @staticmethod
-    def get(url, verbose=False, **kwargs):
+    def get(url, **kwargs):
         response = requests.get(url, **kwargs)
-        if verbose:
-            logging.info(response.url)
         return response.json()
 
     def sget(self, url, **kwargs):
         return self.session.get(url, **kwargs)
-
-
-def filter_general(forums):
-    for forum in forums:
-        if not forum['isSchool']:
-            yield forum