python-documentcloud 4.4.0__tar.gz → 4.4.1__tar.gz

{python_documentcloud-4.4.0/python_documentcloud.egg-info → python_documentcloud-4.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: python-documentcloud
-Version: 4.4.0
+Version: 4.4.1
 Summary: A simple Python wrapper for the DocumentCloud API
 Home-page: https://github.com/muckrock/python-documentcloud
 Author: Mitchell Kotler
@@ -46,6 +46,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary

{python_documentcloud-4.4.0 → python_documentcloud-4.4.1}/documentcloud/client.py

@@ -14,12 +14,11 @@ from .users import UserClient
 
 logger = logging.getLogger("documentcloud")
 
-
 class DocumentCloud(SquareletClient):
     """
     The public interface for the DocumentCloud API, now integrated with SquareletClient
     """
-
+    # pylint:disable=too-many-positional-arguments
     def __init__(
         self,
         username=None,
@@ -31,7 +30,7 @@ class DocumentCloud(SquareletClient):
         rate_limit=True,
         rate_limit_sleep=True,
     ):
-        # Initialize SquareletClient for authentication and request handling
+       # Initialize SquareletClient for authentication and request handling
         super().__init__(
             base_uri=base_uri,
             username=username,
@@ -39,7 +38,7 @@ class DocumentCloud(SquareletClient):
             auth_uri=auth_uri,
             timeout=timeout,
             rate_limit=rate_limit,
-            rate_limit_sleep=rate_limit_sleep,
+            rate_limit_sleep=rate_limit_sleep
         )
 
         # Set up logging
@@ -56,3 +55,8 @@ class DocumentCloud(SquareletClient):
         self.projects = ProjectClient(self)
         self.users = UserClient(self)
         self.organizations = OrganizationClient(self)
+
+    """def _request(self, method, url, raise_error=True, **kwargs):
+        Delegates request to the SquareletClient's _request method
+        return self.squarelet_client.request(method, url, raise_error, **kwargs)
+        """

{python_documentcloud-4.4.0 → python_documentcloud-4.4.1}/documentcloud/documents.py

@@ -74,7 +74,7 @@ class Document(BaseAPIObject):
     def __getattr__(self, attr):
         """Generate methods for fetching resources"""
         p_image = re.compile(
-            r"^get_(?P<size>thumbnail|small|normal|large)_image_url(?P<list>_list)?$"
+            r"^get_(?P<size>thumbnail|small|normal|large|xlarge)_image_url(?P<list>_list)?$"
         )
         get = attr.startswith("get_")
         url = attr.endswith("_url")
@@ -404,7 +404,9 @@ class DocumentClient(BaseAPIClient):
         path_list = self._collect_files(path, extensions)
 
         logger.info(
-            "Upload directory on %s: Found %d files to upload", path, len(path_list)
+            "Upload directory on %s: Found %d files to upload",
+            path,
+            len(path_list)
         )
 
         # Upload all the files using the bulk API to reduce the number
@@ -442,7 +444,7 @@ class DocumentClient(BaseAPIClient):
                     logger.info(
                         "Error creating the following documents: %s\n%s",
                         exc,
-                        "\n".join(file_paths),
+                        "\n".join(file_paths)
                     )
                     continue
                 else:
@@ -463,7 +465,7 @@ class DocumentClient(BaseAPIClient):
                         logger.info(
                             "Error uploading the following document: %s %s",
                             exc,
-                            file_path,
+                            file_path
                         )
                         continue
                     else:
@@ -479,7 +481,7 @@ class DocumentClient(BaseAPIClient):
                     logger.info(
                         "Error creating the following documents: %s\n%s",
                         exc,
-                        "\n".join(file_paths),
+                        "\n".join(file_paths)
                     )
                     continue
                 else:
@@ -502,7 +504,11 @@ class DocumentClient(BaseAPIClient):
             # Grouper will put None's on the end of the last group
             url_group = [url for url in url_group if url is not None]
 
-            logger.info("Uploading group %d: %s", i + 1, "\n".join(url_group))
+            logger.info(
+                "Uploading group %d: %s",
+                i + 1,
+                "\n".join(url_group)
+            )
 
             # Create the documents
             logger.info("Creating the documents...")
@@ -525,7 +531,7 @@ class DocumentClient(BaseAPIClient):
                     logger.info(
                         "Error creating the following documents: %s\n%s",
                         str(exc),
-                        "\n".join(url_group),
+                        "\n".join(url_group)
                     )
                     continue
                 else:

{python_documentcloud-4.4.0 → python_documentcloud-4.4.1/python_documentcloud.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: python-documentcloud
-Version: 4.4.0
+Version: 4.4.1
 Summary: A simple Python wrapper for the DocumentCloud API
 Home-page: https://github.com/muckrock/python-documentcloud
 Author: Mitchell Kotler
@@ -46,6 +46,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary

{python_documentcloud-4.4.0 → python_documentcloud-4.4.1}/setup.py

@@ -7,7 +7,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="python-documentcloud",
-    version="4.4.0",
+    version="4.4.1",
     description="A simple Python wrapper for the DocumentCloud API",
     author="Mitchell Kotler",
     author_email="mitch@muckrock.com",

{python_documentcloud-4.4.0 → python_documentcloud-4.4.1}/tests/test_documents.py

@@ -158,7 +158,9 @@ class TestDocument:
 
 class TestDocumentClient:
     def test_search(self, client, document):
-        documents = client.documents.search(f"document:{document.id} simple")
+        documents = client.documents.search(
+            f"document:{document.id} simple"
+        )
         assert documents
 
     def test_list(self, client):
@@ -180,6 +182,7 @@ class TestDocumentClient:
             document = document_factory(pdf)
         assert document.status == "success"
 
+
     def test_upload_file_path(self, document_factory):
         document = document_factory("tests/test.pdf")
         assert document.status == "success"