Merge pull request #116 from mobeigi/115-pypi-prerelease-refactor

Fixes #115, #71: PyPi Pre-release Refactor

Author: mobeigi

fb2cal/__init__.py

@@ -15,7 +15,3 @@
 """
 
 from .__meta__ import *
-from .transformer import *
-from .facebook_user import *
-from .facebook_browser import *
-from .ics_writer import *

fb2cal/facebook_browser.py

@@ -13,7 +13,6 @@ def __init__(self):
         self.browser = mechanicalsoup.StatefulBrowser()
         self.browser.set_user_agent('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36')
         self.__cached_token = None
-        self.__cached_locale = None
 
     def authenticate(self, email, password):
         """ Authenticate with Facebook setting up session for further requests """

setup.cfg

@@ -1,2 +1,2 @@
 [metadata]
-description-file = README.md
+description_file = README.md

setup.py

@@ -1,5 +1,5 @@
 from setuptools import setup, find_packages
-from fb2cal.__meta__ import __title__, __version__, __description__, __license__, __author__, __email__, __min_python_version__, __website__, __download_url__, __keywords__
+from fb2cal.__meta__ import __title__, __version__, __description__, __license__, __author__, __email__, __website__, __download_url__, __keywords__
 
 setup(
     name=__title__,

tests/test_ics_writer.py

@@ -2,7 +2,8 @@
 from ics import Calendar
 from freezegun import freeze_time
 
-from fb2cal import ICSWriter, FacebookUser
+from fb2cal.ics_writer import ICSWriter
+from fb2cal.facebook_user import FacebookUser
 
 class TestICSWriter(unittest.TestCase):
     def setUp(self):

tests/test_transformer.py

@@ -1,5 +1,5 @@
 import unittest
-from fb2cal import Transformer
+from fb2cal.transformer import Transformer
 
 from mocks.birthday_comet_root_mocks import BIRTHDAY_COMET_ROOT_JANUARY_MOCK