Merge pull request #11 from LouisTrezzini/master

Breaking change: moving the api_client in its own subpackage to clear out the feedly namespace

Author: kireet

README.md

@@ -16,7 +16,7 @@ initalize the client as follows:
 
 ```
 from pathlib import Path
-from feedly.session import FeedlySession
+from feedly.api_client.session import FeedlySession
 
 token = (Path.home() / 'access.token').read_text().strip()
 sess = FeedlySession(token)
@@ -117,4 +117,4 @@ To debug things, set the log level to `DEBUG`. This will print log messages on e
 The above examples assume the auth (access) token is valid. However these tokens do expire. Instead 
 of passing the auth token itself, you can create a `feedly.session.Auth` implementation to refresh
 the auth token. A file based implementation is already provided (`FileAuthStore`). Once this is done
-the client will automatically try to refresh the auth token if a `401` response is encountered.  
+the client will automatically try to refresh the auth token if a `401` response is encountered.

feedly/__init__.py feedly/api_client/__init__.pyfeedly/__init__.py renamed to feedly/api_client/__init__.py

@@ -3,12 +3,12 @@
    handy getter methods, but otherwise you can just use a .json property to access the
    raw json passed back by the client.
 """
-from typing import Any, Dict, Optional, Callable, Union, List
+from typing import Any, Callable, Dict, List, Optional, Union
 from urllib.parse import quote_plus
 
-from feedly.protocol import APIClient
-from feedly.stream import STREAM_SOURCE_USER, StreamOptions, StreamBase, UserStreamId, EnterpriseStreamId, StreamIdBase, STREAM_SOURCE_ENTERPRISE
-import logging
+from feedly.api_client.protocol import APIClient
+from feedly.api_client.stream import EnterpriseStreamId, STREAM_SOURCE_ENTERPRISE, STREAM_SOURCE_USER, StreamBase, StreamIdBase, StreamOptions, UserStreamId
+
 
 class FeedlyData:
     def __init__(self, json:Dict[str,Any], client:APIClient=None):

feedly/data.py feedly/api_client/data.pyfeedly/data.py renamed to feedly/api_client/data.py

@@ -1,9 +1,10 @@
+import datetime
+import json
 import time
-from typing import Optional, Dict, Union, Any, List
-from requests.exceptions import HTTPError
+from typing import Any, Dict, List, Optional, Union
+
 from requests import Response
-import json
-import datetime
+from requests.exceptions import HTTPError
 
 
 class WrappedHTTPError(HTTPError):

feedly/protocol.py feedly/api_client/protocol.pyfeedly/protocol.py renamed to feedly/api_client/protocol.py

@@ -1,21 +1,17 @@
-from pprint import pprint
+import datetime
+import logging
 import time
 from pathlib import Path
-from typing import Dict, Any, Union, List, Optional
-
-import logging
-
-import datetime
+from pprint import pprint
+from typing import Any, Dict, List, Union
 from urllib.parse import quote_plus
 
+from requests import Session
 from requests.adapters import HTTPAdapter
 from requests.exceptions import HTTPError
 
-from requests import Session
-
-from feedly.data import FeedlyUser
-from feedly.protocol import RateLimitedAPIError, BadRequestAPIError, UnauthorizedAPIError, ServerAPIError, APIClient, WrappedHTTPError
-from feedly.stream import StreamIdBase
+from feedly.api_client.data import FeedlyUser
+from feedly.api_client.protocol import APIClient, BadRequestAPIError, RateLimitedAPIError, ServerAPIError, UnauthorizedAPIError
 
 
 class Auth:
@@ -218,14 +214,3 @@ def do_api_request(self, relative_url:str, method:str=None, data:Dict=None,
                 raise ServerAPIError(e)
 
             raise e
-
-if __name__ == '__main__':
-        logging.basicConfig(level='DEBUG')
-        # token = (Path.home() / 'access.token').read_text().strip()
-        auth = FileAuthStore(Path.home())
-        # print(sess.user['fullName'])
-
-        sess = FeedlySession(auth)
-
-        for k, v in sess.user.get_categories().items():
-            pprint(f"{k} -- {v['label']}")

feedly/session.py feedly/api_client/session.pyfeedly/session.py renamed to feedly/api_client/session.py

@@ -1,10 +1,9 @@
+import logging
 from collections import deque
 from typing import List
 from urllib.parse import quote_plus
 
-import logging
-
-from feedly.protocol import APIClient
+from feedly.api_client.protocol import APIClient
 
 STREAM_SOURCE_USER:str = 'user'
 STREAM_SOURCE_ENTERPRISE:str = 'enterprise'

feedly/stream.py feedly/api_client/stream.pyfeedly/stream.py renamed to feedly/api_client/stream.py

@@ -18,7 +18,7 @@
 EMAIL = 'kireet@feedly.com'
 AUTHOR = 'Kireet'
 REQUIRES_PYTHON = '>=3.6.0'
-VERSION = 0.19
+VERSION = '0.20'
 
 # What packages are required for this module to be executed?
 with open('requirements.txt') as f:
@@ -87,7 +87,7 @@ def run(self):
         self.status('Pushing git tags…')
         os.system('git tag v{0}'.format(about['__version__']))
         os.system('git push --tags')
-        
+
         sys.exit()
 
 
@@ -102,7 +102,7 @@ def run(self):
     author_email=EMAIL,
     python_requires=REQUIRES_PYTHON,
     url=URL,
-    packages=find_packages(exclude=('tests',)),
+    packages=['feedly.api_client'],
     # If your package is a single module, use this instead of 'packages':
     # py_modules=['mypackage'],