From a2d9305abe097d3bbd26063ea58472f4c0cf21e3 Mon Sep 17 00:00:00 2001 From: Raissa Ferreira Date: Mon, 29 Oct 2018 00:10:09 -0300 Subject: [PATCH] fix: Fix package import errors --- flask_google_cloud_logger/__init__.py | 8 ++++---- setup.py | 8 +++----- test/test_hooks.py | 7 +++---- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/flask_google_cloud_logger/__init__.py b/flask_google_cloud_logger/__init__.py index 85b4f72..718ea01 100644 --- 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 index de093c8..629b560 100644 --- 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 index b0a5454..45d2724 100644 --- a/test/test_hooks.py +++ b/test/test_hooks.py @@ -1,6 +1,6 @@ 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): @@ -8,7 +8,7 @@ def test_flask_google_cloud_logger_before_request(app_client, mocker): "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