Skip to content

Commit

Permalink
rem(logging): remove debug loggers
Browse files Browse the repository at this point in the history
  • Loading branch information
amatmv committed Feb 14, 2023
1 parent d7cdf99 commit 78cbb36
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 59 deletions.
9 changes: 2 additions & 7 deletions akeneo_api_client/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def _request_a_token(self, grant_type="password"):
"grant_type parameter is expected to be either "
+ '"password" or "refresh_token". {0} provided'.format(grant_type)
)
logger.debug(data)

url = urljoin(self._base_url, self.TOKEN_PATH)
r = requests.post(url, data=data, headers=headers)
if r.status_code != 200:
Expand All @@ -66,9 +66,7 @@ def _request_a_token(self, grant_type="password"):
raise SyntaxError(
"The server did not return expected json: {0}".format(r.text)
)
logger.debug(r.status_code)
logger.debug(r.encoding)
logger.debug(json.dumps(json_data, indent=4, sort_keys=True))

try:
self._token = json_data["access_token"]
self._refresh_token = json_data["refresh_token"]
Expand All @@ -85,9 +83,6 @@ def _request_a_token(self, grant_type="password"):
raise SyntaxError(
"The server did not return a valid expires_in: {0}".format(json_data)
)
logger.debug(self.authorization)
logger.debug(self._refresh_token)
logger.debug(self._expiry_date)

def _should_refresh_token(self):
"""Returns True if the token is expired / about to expire"""
Expand Down
10 changes: 2 additions & 8 deletions akeneo_api_client/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
class CreatableResource(interfaces.CreatableResourceInterface):
def create_item(self, item):
url = self._endpoint
logger.debug(json.dumps(item, separators=(",", ":")))
r = self._session.post(url, data=json.dumps(item, separators=(",", ":")))

if r.status_code != 201:
Expand Down Expand Up @@ -58,31 +57,27 @@ def fetch_list(self, args=None):

class GettableResource(interfaces.GettableResourceInterface):
def fetch_item(self, code_or_item):
"""Returns a unique item object. code_or_item should be a the code
"""Returns a unique item object. code_or_item should be the code
of the desired item, or an item with the proper code."""
code = code_or_item
if not isinstance(code_or_item, str):
# if code_or_item is item, then fetch the code
code = self.get_code(code_or_item)

logger.debug(self._endpoint)
url = urljoin(self._endpoint, code)
logger.debug(url)
r = self._session.get(url)

if r.status_code != 200:
raise requests.HTTPError(
"The item {0} doesn't exit: {1}".format(code, r.status_code)
)

logger.debug(r.status_code)
logger.debug(r.text)
return json.loads(r.text) # returns item as a dict


class DeletableResource(interfaces.DeletableResourceInterface):
def delete_item(self, code_or_item):
"""code_or_item should be a the code
"""code_or_item should be the code
of the desired item, or an item with the proper code."""
code = code_or_item
if not isinstance(code_or_item, str):
Expand All @@ -103,7 +98,6 @@ def update_create_item(self, item_values, code=None):
code = self.get_code(item_values)

url = urljoin(self._endpoint, code)
logger.debug(json.dumps(item_values, separators=(",", ":")))
r = self._session.patch(
url, data=json.dumps(item_values, separators=(",", ":"))
)
Expand Down
11 changes: 0 additions & 11 deletions tests/test_auth.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
# -*- coding: utf-8 -*-

from akeneo_api_client.auth import Auth

import requests
from requests.auth import AuthBase
from akeneo_api_client.utils import urljoin
import unittest
import base64
import json
from time import time

import logging
import logzero
from logzero import logger

from vcr_unittest import VCRTestCase

Expand Down Expand Up @@ -55,8 +49,6 @@ def test_should_refresh_request(self):
auth = Auth(self.base_url,
self.client_id, self.secret, self.username, self.password)
auth._request_a_token()
logger.debug(int(time()))
logger.debug(auth._expiry_date)
self.assertFalse(auth._should_refresh_token())
auth._expiry_date = time() - 100
self.assertTrue(auth._should_refresh_token())
Expand All @@ -65,8 +57,5 @@ def test_query_products_with_auth(self):
auth = Auth(self.base_url,
self.client_id, self.secret, self.username, self.password)
r = requests.get(urljoin(self.base_url, "/api/rest/v1/products"), auth=auth)
logger.debug(r)
logger.debug(r.status_code)
json_data = json.loads(r.text)
logger.debug(json.dumps(json_data, indent=4, sort_keys=True))

15 changes: 0 additions & 15 deletions tests/test_client.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
# -*- coding: utf-8 -*-

from akeneo_api_client.result import *
from akeneo_api_client.resources import *
from akeneo_api_client.auth import Auth
from akeneo_api_client.utils import urljoin
from akeneo_api_client.client import *
import sys

import requests
from requests.auth import AuthBase
import unittest
import base64
import json
from time import time

import logging
import logzero
from logzero import logger

from vcr_unittest import VCRTestCase

import copy

class TestClient(VCRTestCase):
client_id = '1_ovvscbaj0pwwg8sookkgkc8ck4kog8gscg8g44sc88c8w48ww'
Expand Down Expand Up @@ -75,11 +64,9 @@ def test_update_very_long_list(self):

statuses = akeneo.products.update_create_list(items)

logger.debug(statuses)
for status in statuses:
self.assertIn(status['status_code'], [201, 204])

logger.debug('Cleaning up products...')
# TODO: replace this really long cleaning up
# by targeting a new clean database container / PIM instance / whatever
for item in items:
Expand Down Expand Up @@ -189,7 +176,6 @@ def test_product_search(self):
item = next(iterator)
self.assertEquals(len(items.get_page_items()), 15)


def test_family_variants(self):
akeneo = Client(self.base_url,
self.client_id, self.secret, self.username, self.password)
Expand All @@ -210,7 +196,6 @@ def test_attribute_options(self):
for attribute in attributes:
attribute_code = akeneo.attributes.get_code(attribute)
options_pool = akeneo.attributes.options(attribute_code)
logger.debug(options_pool._endpoint)
if attribute_code in ['auto_exposure', 'auto_focus_assist_beam',
'auto_focus_lock', 'auto_focus_modes', 'auto_focus_points',
'camera_model_name', 'care_instructions']:
Expand Down
8 changes: 0 additions & 8 deletions tests/test_collection.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
# -*- coding: utf-8 -*-

from akeneo_api_client.result import *
from akeneo_api_client.resources import *
from akeneo_api_client.auth import Auth
from akeneo_api_client.utils import urljoin

import requests
from requests.auth import AuthBase
import unittest
import base64
import json
from time import time

import logging
import logzero
Expand Down Expand Up @@ -144,7 +137,6 @@ def test_fetch_item(self):
session.headers.update({'Content-Type': 'application/json'})
pool = BasicResourcePool(urljoin(self.base_url, '/api/rest/v1/', 'products/'), session)
item = pool.fetch_item('1111111137')
logger.debug(item)
self.assertEqual(item['identifier'], '1111111137')
self.assertEqual(len(item['categories']), 3)

Expand Down
10 changes: 0 additions & 10 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
# -*- coding: utf-8 -*-

import akeneo_api_client
import akeneo_api_client.utils
from akeneo_api_client.utils import *

import requests
import unittest
import base64
import json
from time import time

import logging
import logzero
from logzero import logger

from vcr_unittest import VCRTestCase


class TestUtils(unittest.TestCase):
Expand Down

0 comments on commit 78cbb36

Please sign in to comment.