python3-discogs-client 2.5__tar.gz → 2.7__tar.gz

{python3-discogs-client-2.5/python3_discogs_client.egg-info → python3-discogs-client-2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python3-discogs-client
-Version: 2.5
+Version: 2.7
 Summary: Python API client for Discogs
 Home-page: https://github.com/joalla/discogs_client
 Author: joalla

{python3-discogs-client-2.5 → python3-discogs-client-2.7}/discogs_client/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.5'
+__version__ = '2.7'
 __version_info__ = tuple(int(i) for i in __version__.split('.') if i.isdigit())
 
 from discogs_client.client import Client

{python3-discogs-client-2.5 → python3-discogs-client-2.7}/discogs_client/client.py

@@ -1,4 +1,5 @@
 import json
+from typing import Union
 from urllib.parse import urlencode
 
 from discogs_client import models
@@ -193,3 +194,28 @@ class Client:
         if not isinstance(value, bool):
             raise ValueError("Backoff enabled toggle should be of type bool")
         self._fetcher.backoff_enabled = value
+
+    @property
+    def connection_timeout(self):
+        """Return current client connection timeout"""
+        return self._fetcher.connect_timeout
+
+    @property
+    def read_timeout(self):
+        """Return current client read timeout"""
+        return self._fetcher.read_timeout
+
+    def set_timeout(self,
+                    connect: Union[int, float] = 5,
+                    read: Union[int, float] = 10) -> None:
+        """Set request timeout parameters
+
+        Parameters
+        ----------
+            connect : (Union[int, float], optional)
+                Time in seconds after which connect will timeout. Defaults to 5.
+            read : (Union[int, float], optional)
+                Time in seconds after which request will timeout. Defaults to 10.
+        """
+        self._fetcher.connect_timeout = connect
+        self._fetcher.read_timeout = read

{python3-discogs-client-2.5 → python3-discogs-client-2.7}/discogs_client/fetchers.py

@@ -1,4 +1,3 @@
-import requests
 from requests.api import request
 from oauthlib import oauth1
 import json
@@ -6,6 +5,7 @@ import os
 import re
 from discogs_client.utils import backoff
 from urllib.parse import parse_qsl
+from typing import Union
 
 
 class Fetcher:
@@ -16,6 +16,8 @@ class Fetcher:
     (It's a slightly leaky abstraction designed to make testing easier.)
     """
     backoff_enabled = True
+    connect_timeout: Union[float, int, None] = None
+    read_timeout: Union[float, int, None] = None
 
     def fetch(self, client, method, url, data=None, headers=None, json=True):
         """Fetch the given request
@@ -52,8 +54,11 @@ class Fetcher:
 
     @backoff
     def request(self, method, url, data, headers, params=None):
-        response = request(method=method, url=url, data=data, headers=headers, params=params)
-        return response
+        return request(
+            method=method, url=url, data=data,
+            headers=headers, params=params,
+            timeout=(self.connect_timeout, self.read_timeout)
+        )
 
 
 class LoggingDelegator:

{python3-discogs-client-2.5 → python3-discogs-client-2.7}/discogs_client/models.py

@@ -478,7 +478,10 @@ class Artist(PrimaryAPIObject):
     #: single string, for example: "DJ ABC Feat MC Z". Also check out the
     #: ``artists_sort`` attribute of a ``Release`` object.
     join = SimpleField()
-
+    #: This attribute is only present when an ``Artist`` object is part of a
+    #: ``credits`` list of a ``Release`` object.
+    role = SimpleField()
+    
     def __init__(self, client, dict_):
         super(Artist, self).__init__(client, dict_)
         self.data['resource_url'] = '{0}/artists/{1}'.format(client._base_url, dict_['id'])

{python3-discogs-client-2.5 → python3-discogs-client-2.7}/discogs_client/tests/test_core.py

@@ -1,5 +1,6 @@
 import unittest
 from discogs_client import Client
+from discogs_client.fetchers import MemoryFetcher
 from discogs_client.tests import DiscogsClientTestCase
 from discogs_client.exceptions import ConfigurationError, HTTPError
 from datetime import datetime
@@ -110,6 +111,37 @@ class CoreTestCase(DiscogsClientTestCase):
         results.per_page = 10
         self.assertTrue(results._num_pages is None)
 
+    def test_timeout_defaults_to_none(self):
+        # Need to create client without LoggingDelegator here
+        # self.d would throw AttributeError trying to access timeout properties on LoggingDelegator
+        client = Client('')
+        client._fetcher = MemoryFetcher({})
+        self.assertEqual(None, client.connection_timeout)
+        self.assertEqual(None, client.read_timeout)
+
+    def test_set_timeout_in_float(self):
+        self.d.set_timeout(connect=1.23, read=7.42)
+        self.assertEqual(1.23, self.d.connection_timeout)
+        self.assertEqual(7.42, self.d.read_timeout)
+
+    def test_set_timeout_in_int(self):
+        self.d.set_timeout(connect=3, read=6)        
+        self.assertEqual(3, self.d.connection_timeout)
+        self.assertEqual(6, self.d.read_timeout)
+
+    def test_set_timeout_to_none(self):
+        self.d.set_timeout(connect=5, read=None)
+        self.assertEqual(5, self.d.connection_timeout)
+        self.assertEqual(None, self.d.read_timeout)
+
+        self.d.set_timeout(connect=None, read=10)
+        self.assertEqual(None, self.d.connection_timeout)
+        self.assertEqual(10, self.d.read_timeout)
+
+        self.d.set_timeout(connect=None, read=None)
+        self.assertEqual(None, self.d.connection_timeout)
+        self.assertEqual(None, self.d.read_timeout)
+
 
 def suite():
     suite = unittest.TestSuite()

{python3-discogs-client-2.5 → python3-discogs-client-2.7}/discogs_client/tests/test_models.py

@@ -9,6 +9,9 @@ class ModelsTestCase(DiscogsClientTestCase):
         """Artists can be fetched and parsed"""
         a = self.d.artist(1)
         self.assertEqual(a.name, 'Persuader, The')
+        a2 = self.d.release(1).credits[0]
+        self.assertEqual(a2.name, 'Jesper Dahlbäck')
+        self.assertEqual(a2.role, 'Music By [All Tracks By]')
 
     def test_same_artist(self):
         """Artists can be fetched and parsed multiple times"""

{python3-discogs-client-2.5 → python3-discogs-client-2.7/python3_discogs_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python3-discogs-client
-Version: 2.5
+Version: 2.7
 Summary: Python API client for Discogs
 Home-page: https://github.com/joalla/discogs_client
 Author: joalla

{python3-discogs-client-2.5 → python3-discogs-client-2.7}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
         name='python3-discogs-client',
-        version='2.5',
+        version='2.7',
         description='Python API client for Discogs',
         long_description='This is an active fork of the official "Discogs API client for Python", which was deprecated by discogs.com as of June 2020. We think it is a very useful Python module and decided to continue maintaining it. Please visit: https://github.com/joalla/discogs_client for more information.',
         url='https://github.com/joalla/discogs_client',