fix: Fix package import errors

rai200890 · Oct 29, 2018 · a2d9305 · a2d9305
1 parent 4c5e953
commit a2d9305
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/flask_google_cloud_logger/__init__.py b/flask_google_cloud_logger/__init__.py
@@ -1,5 +1,5 @@
-from .hooks import (flask_google_cloud_logger_before_request,
-                    flask_google_cloud_logger_after_request)
+from . import hooks
+from . import formatter # noqa
 
 
 class FlaskGoogleCloudLogger(object):
@@ -18,5 +18,5 @@ def teardown(self, exception):
                 "flask_google_cloud_logger_after_request", None)
 
     def init_app(self, app):
-        app.before_request(flask_google_cloud_logger_before_request)
-        app.after_request(flask_google_cloud_logger_after_request)
+        app.before_request(hooks.flask_google_cloud_logger_before_request)
+        app.after_request(hooks.flask_google_cloud_logger_after_request)
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="flask_google_cloud_logger",
-    version="0.0.1",
+    version="0.0.2",
     description="Google Cloud Log Formatter for Flask",
     url="http://github.com/rai200890/flask_google_cloud_logger",
     author="Raissa Ferreira",
@@ -14,11 +14,9 @@
         "flask>=1.0",
     ],
     classifiers=[
-        "Environment :: Web Environment",
-        "Intended Audience :: Developers",
+        "Environment :: Web Environment", "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
-        "Natural Language :: English",
-        "Operating System :: OS Independent",
+        "Natural Language :: English", "Operating System :: OS Independent",
         "Programming Language :: Python :: 3 :: Only",
         "Topic :: System :: Logging"
     ],

diff --git a/test/test_hooks.py b/test/test_hooks.py
@@ -1,14 +1,14 @@
 from flask import g
 
-import flask_google_cloud_logger
+from flask_google_cloud_logger import hooks
 
 
 def test_flask_google_cloud_logger_before_request(app_client, mocker):
     mocker.patch(
         "flask_google_cloud_logger.hooks.time",
         return_value=1540174450.9542747)
     with app_client.application.app_context():
-        flask_google_cloud_logger.flask_google_cloud_logger_before_request()
+        hooks.flask_google_cloud_logger_before_request()
         assert g.get("start_request") == 1540174450.9542747
 
 
@@ -19,7 +19,6 @@ def test_flask_google_cloud_logger_after_request(app_client, mocker):
             "flask_google_cloud_logger.hooks.time",
             return_value=1540175117.2246253)
         g.start_request = 1540174450.9542747
-        flask_google_cloud_logger.flask_google_cloud_logger_after_request(
-            response)
+        hooks.flask_google_cloud_logger_after_request(response)
         assert g.get("request_time") == 666270.3506946564
         assert g.response == response