pyzotero 1.5.28__tar.gz → 1.6.1__tar.gz

{pyzotero-1.5.28 → pyzotero-1.6.1}/.github/pull_request_template.md

@@ -2,11 +2,11 @@ Thanks for opening a PR. Please read the following:
 
 - **Base your changes on the `dev` branch**
     - If necessary, rebase against `dev` before opening a pull request
-- Follow [PEP 8](http://www.python.org/dev/peps/pep-0008/). I currently periodically run [`Black`](https://black.readthedocs.io/en/stable/) against the codebase and perhaps you should, too
+- Follow [PEP 8](http://www.python.org/dev/peps/pep-0008/). I run [`ruff`](https://docs.astral.sh/ruff/) against the codebase and perhaps you should, too
 - Use spaces for indentation, and ensure that all methods have a proper docstring. **Please don't use Doctest**
 - If at all possible, don't add dependencies
     - If it's unavoidable, ensure that the dependency is maintained, and supported
-    - Ensure that you add your dependency to [setup.py](setup.py)
+    - Ensure that you add your dependency to [pyproject.toml](pyproject.toml)
 - Run the tests, and ensure that they pass. If you're adding a feature, **you must add tests that exercise it**
 - If your pull request is a feature, **document it**
 - One feature per pull request
@@ -14,5 +14,5 @@ Thanks for opening a PR. Please read the following:
 - If in doubt, comment your code.
 
 ## License of Contributed Code
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you shall be MIT licensed, without any additional terms or conditions.  
-Please note that pull requests with licenses that are more restrictive than or otherwise incompatible with the MIT license will not be accepted.
+Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you shall be licensed under the Blua Oak Model License 1.0, without any additional terms or conditions.  
+Please note that pull requests with licenses that are more restrictive than or otherwise incompatible with the license will not be accepted.

{pyzotero-1.5.28 → pyzotero-1.6.1}/.github/workflows/tests.yml

@@ -85,6 +85,6 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: PyPI Publish
-      uses: pypa/gh-action-pypi-publish@v1.12.2
+      uses: pypa/gh-action-pypi-publish@v1.12.3
       with:
         packages-dir: ${{ steps.download.outputs.download-path }}

{pyzotero-1.5.28/src/pyzotero.egg-info → pyzotero-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyzotero
-Version: 1.5.28
+Version: 1.6.1
 Summary: Python wrapper for the Zotero API
 Author-email: Stephan Hügel <urschrei@gmail.com>
 License: # Blue Oak Model License

{pyzotero-1.5.28 → pyzotero-1.6.1}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.5.28'
-__version_tuple__ = version_tuple = (1, 5, 28)
+__version__ = version = '1.6.1'
+__version_tuple__ = version_tuple = (1, 6, 1)

{pyzotero-1.5.28 → pyzotero-1.6.1}/src/pyzotero/zotero.py

@@ -24,8 +24,16 @@ import uuid
 import zipfile
 from collections import OrderedDict
 from functools import wraps
-from pathlib import Path
-from urllib.parse import parse_qs, parse_qsl, quote, urlencode, urlparse, urlunparse
+from pathlib import Path, PurePosixPath
+from urllib.parse import (
+    parse_qs,
+    parse_qsl,
+    quote,
+    unquote,
+    urlencode,
+    urlparse,
+    urlunparse,
+)
 
 import bibtexparser
 import feedparser
@@ -272,8 +280,10 @@ class Zotero:
         """Store Zotero credentials"""
         if not local:
             self.endpoint = "https://api.zotero.org"
+            self.local = False
         else:
             self.endpoint = "http://localhost:23119/api"
+            self.local = True
         if library_id and library_type:
             self.library_id = library_id
             # library_type determines whether query begins w. /users or /groups
@@ -321,6 +331,22 @@ class Zotero:
         self.backoff = False
         self.backoff_duration = 0.0
 
+    def _check_for_component(self, url, component):
+        """Check a url path query fragment for a specific query parameter"""
+        if parse_qs(url).get(component):
+            return True
+        return False
+
+    def _striplocal(self, url):
+        """We need to remve the leading "/api" substring from urls if we're running in local mode"""
+        if self.local:
+            parsed = urlparse(url)
+            purepath = PurePosixPath(unquote(parsed.path))
+            newpath = "/".join(purepath.parts[2:])
+            replaced = parsed._replace(path="/" + newpath)
+            return urlunparse(replaced)
+        return url
+
     def _set_backoff(self, duration):
         """
         Set a backoff
@@ -406,10 +432,16 @@ class Zotero:
         self.self_link = request
         # ensure that we wait if there's an active backoff
         self._check_backoff()
-        if params:
-            params["locale"] = self.locale
-        if not params:
-            params = {"locale": self.locale}
+        # don't set locale if the url already contains it
+        # we always add a locale if it's a "standalone" or first call
+        needs_locale = not self.links or not self._check_for_component(
+            self.links.get("next"), "locale"
+        )
+        if needs_locale:
+            if params:
+                params["locale"] = self.locale
+            else:
+                params = {"locale": self.locale}
         self.request = requests.get(
             url=full_url, headers=self.default_headers(), params=params
         )
@@ -845,10 +877,11 @@ class Zotero:
     @retrieve
     def follow(self):
         """Return the result of the call to the URL in the 'Next' link"""
-        if self.links.get("next"):
-            return self.links.get("next")
-        else:
-            return
+        if n := self.links.get("next"):
+            newurl = self._striplocal(n)
+            print(newurl)
+            return newurl
+        return
 
     def iterfollow(self):
         """Generator for self.follow()"""

{pyzotero-1.5.28 → pyzotero-1.6.1/src/pyzotero.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyzotero
-Version: 1.5.28
+Version: 1.6.1
 Summary: Python wrapper for the Zotero API
 Author-email: Stephan Hügel <urschrei@gmail.com>
 License: # Blue Oak Model License

{pyzotero-1.5.28 → pyzotero-1.6.1}/tests/test_zotero.py

@@ -59,7 +59,7 @@ class ZoteroTests(unittest.TestCase):
             content_type="application/json",
             body=self.items_doc,
         )
-    
+
     def testBuildUrlCorrectHandleEndpoint(self):
         """url should be concat correctly by build_url"""
         url = z.build_url("http://localhost:23119/api", "/users/0")
@@ -84,6 +84,20 @@ class ZoteroTests(unittest.TestCase):
             parse_qs("start=7&limit=100&format=json"), parse_qs(zot.url_params)
         )
 
+    @httpretty.activate
+    def testLocale(self):
+        """Should correctly add locale to request because it's an initial request"""
+        HTTPretty.register_uri(
+            HTTPretty.GET,
+            "https://api.zotero.org/users/myuserID/items",
+            content_type="application/json",
+            body=self.item_doc,
+        )
+        zot = z.Zotero("myuserID", "user", "myuserkey")
+        _ = zot.items()
+        req = zot.request
+        self.assertEqual(req.url.find("locale"), 66)
+
     @httpretty.activate
     def testRequestBuilderLimitNone(self):
         """Should skip limit = 100 param if limit is set to None"""