pyzotero 1.5.9__py3-none-any.whl → 1.5.15__py3-none-any.whl

_version.py

@@ -0,0 +1,8 @@
+# file generated by setuptools_scm
+# don't change, don't track in version control
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+
+__version__ = version = '1.5.15'  # type: str
+__version_tuple__ = version_tuple = (1, 5, 15)  # type: Tuple[int | str, ...]

pyzotero/__init__.py

@@ -0,0 +1,7 @@
+import importlib.metadata
+
+try:
+    # __package__ allows for the case where __name__ is "__main__"
+    __version__ = importlib.metadata.version(__package__ or __name__)
+except importlib.metadata.PackageNotFoundError:
+    __version__ = "0.0.0"

pyzotero/zotero.py

@@ -29,11 +29,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 """
-from . import version as pzv
 
 __author__ = "Stephan Hügel"
 __api_version__ = "3"
-__version__ = pzv.__version__
 
 import requests
 from requests import Request
@@ -58,6 +56,7 @@ from urllib.parse import urlparse, urlunparse, parse_qsl
 from urllib.parse import quote
 
 from . import zotero_errors as ze
+import pyzotero as pz
 
 
 # Avoid hanging the application if there's no server response
@@ -145,8 +144,8 @@ def backoff_check(func):
         resp = func(self, *args, **kwargs)
         try:
             resp.raise_for_status()
-        except requests.exceptions.HTTPError:
-            error_handler(self, resp)
+        except requests.exceptions.HTTPError as exc:
+            error_handler(self, resp, exc)
         self.request = resp
         backoff = resp.headers.get("backoff") or resp.headers.get("retry-after")
         if backoff:
@@ -358,7 +357,7 @@ class Zotero:
         It's always OK to include these headers
         """
         _headers = {
-            "User-Agent": "Pyzotero/%s" % __version__,
+            "User-Agent": "Pyzotero/%s" % pz.__version__,
             "Zotero-API-Version": "%s" % __api_version__,
         }
         if self.api_key:
@@ -408,8 +407,8 @@ class Zotero:
         self.request.encoding = "utf-8"
         try:
             self.request.raise_for_status()
-        except requests.exceptions.HTTPError:
-            error_handler(self, self.request)
+        except requests.exceptions.HTTPError as exc:
+            error_handler(self, self.request, exc)
         backoff = self.request.headers.get("backoff") or self.request.headers.get(
             "retry-after"
         )
@@ -476,8 +475,8 @@ class Zotero:
             req = requests.get(query, headers=headers)
             try:
                 req.raise_for_status()
-            except requests.exceptions.HTTPError:
-                error_handler(self, req)
+            except requests.exceptions.HTTPError as exc:
+                error_handler(self, req, exc)
             backoff = self.request.headers.get("backoff") or self.request.headers.get(
                 "retry-after"
             )
@@ -625,8 +624,8 @@ class Zotero:
         resp = requests.get(build_url(self.endpoint, query_string), headers=headers)
         try:
             resp.raise_for_status()
-        except requests.exceptions.HTTPError:
-            error_handler(self, resp)
+        except requests.exceptions.HTTPError as exc:
+            error_handler(self, resp, exc)
         backoff = self.request.headers.get("backoff") or self.request.headers.get(
             "retry-after"
         )
@@ -1023,8 +1022,8 @@ class Zotero:
         self.request = req
         try:
             req.raise_for_status()
-        except requests.exceptions.HTTPError:
-            error_handler(self, req)
+        except requests.exceptions.HTTPError as exc:
+            error_handler(self, req, exc)
         backoff = self.request.headers.get("backoff") or self.request.headers.get(
             "retry-after"
         )
@@ -1051,8 +1050,8 @@ class Zotero:
         self.request = req
         try:
             req.raise_for_status()
-        except requests.exceptions.HTTPError:
-            error_handler(self, req)
+        except requests.exceptions.HTTPError as exc:
+            error_handler(self, req, exc)
         backoff = self.request.headers.get("backoff") or self.request.headers.get(
             "retry-after"
         )
@@ -1227,8 +1226,8 @@ class Zotero:
         self.request = req
         try:
             req.raise_for_status()
-        except requests.exceptions.HTTPError:
-            error_handler(self, req)
+        except requests.exceptions.HTTPError as exc:
+            error_handler(self, req, exc)
         resp = req.json()
         backoff = self.request.headers.get("backoff") or self.request.headers.get(
             "retry-after"
@@ -1259,8 +1258,8 @@ class Zotero:
                 self.request = presp
                 try:
                     presp.raise_for_status()
-                except requests.exceptions.HTTPError:
-                    error_handler(self, presp)
+                except requests.exceptions.HTTPError as exc:
+                    error_handler(self, presp, exc)
                 backoff = presp.headers.get("backoff") or presp.headers.get(
                     "retry-after"
                 )
@@ -1303,8 +1302,8 @@ class Zotero:
         self.request = req
         try:
             req.raise_for_status()
-        except requests.exceptions.HTTPError:
-            error_handler(self, req)
+        except requests.exceptions.HTTPError as exc:
+            error_handler(self, req, exc)
         backoff = req.headers.get("backoff") or req.headers.get("retry-after")
         if backoff:
             self._set_backoff(backoff)
@@ -1417,8 +1416,8 @@ class Zotero:
             self.request = req
             try:
                 req.raise_for_status()
-            except requests.exceptions.HTTPError:
-                error_handler(self, req)
+            except requests.exceptions.HTTPError as exc:
+                error_handler(self, req, exc)
             backoff = req.headers.get("backoff") or req.headers.get("retry-after")
             if backoff:
                 self._set_backoff(backoff)
@@ -1449,8 +1448,8 @@ class Zotero:
             self.request = req
             try:
                 req.raise_for_status()
-            except requests.exceptions.HTTPError:
-                error_handler(self, req)
+            except requests.exceptions.HTTPError as exc:
+                error_handler(self, req, exc)
             backoff = req.headers.get("backoff") or req.headers.get("retry-after")
             if backoff:
                 self._set_backoff(backoff)
@@ -1602,7 +1601,7 @@ class Zotero:
         return requests.delete(url=url, params=params, headers=headers)
 
 
-def error_handler(zot, req):
+def error_handler(zot, req, exc=None):
     """Error handler for HTTP requests"""
     error_codes = {
         400: ze.UnsupportedParams,
@@ -1638,14 +1637,21 @@ def error_handler(zot, req):
             else:
                 zot._set_backoff(delay)
         else:
-            raise error_codes.get(req.status_code)(err_msg(req))
+            if not exc:
+                raise error_codes.get(req.status_code)(err_msg(req))
+            else:
+                raise error_codes.get(req.status_code)(err_msg(req)) from exc
     else:
-        raise ze.HTTPError(err_msg(req))
+        if not exc:
+            raise ze.HTTPError(err_msg(req))
+        else:
+            raise ze.HTTPError(err_msg(req)) from exc
 
 
 class SavedSearch:
     """Saved search functionality
-    See https://github.com/zotero/zotero/blob/master/chrome/content/zotero/xpcom/data/searchConditions.js"""
+    See https://github.com/zotero/zotero/blob/master/chrome/content/zotero/xpcom/data/searchConditions.js
+    """
 
     def __init__(self, zinstance):
         super(SavedSearch, self).__init__()
@@ -1889,8 +1895,8 @@ class Zupload:
         )
         try:
             req.raise_for_status()
-        except requests.exceptions.HTTPError:
-            error_handler(self.zinstance, req)
+        except requests.exceptions.HTTPError as exc:
+            error_handler(self.zinstance, req, exc)
         backoff = req.headers.get("backoff") or req.headers.get("retry-after")
         if backoff:
             self.zinstance._set_backoff(backoff)
@@ -1939,8 +1945,8 @@ class Zupload:
         )
         try:
             auth_req.raise_for_status()
-        except requests.exceptions.HTTPError:
-            error_handler(self.zinstance, auth_req)
+        except requests.exceptions.HTTPError as exc:
+            error_handler(self.zinstance, auth_req, exc)
         backoff = auth_req.headers.get("backoff") or auth_req.headers.get("retry-after")
         if backoff:
             self.zinstance._set_backoff(backoff)
@@ -1967,12 +1973,12 @@ class Zupload:
                 files=upload_pairs,
                 headers={"User-Agent": "Pyzotero/%s" % __version__},
             )
-        except (requests.exceptions.ConnectionError):
+        except requests.exceptions.ConnectionError:
             raise ze.UploadError("ConnectionError")
         try:
             upload.raise_for_status()
-        except requests.exceptions.HTTPError:
-            error_handler(self.zinstance, upload)
+        except requests.exceptions.HTTPError as exc:
+            error_handler(self.zinstance, upload, exc)
         backoff = upload.headers.get("backoff") or upload.headers.get("retry-after")
         if backoff:
             self.zinstance._set_backoff(backoff)
@@ -2004,8 +2010,8 @@ class Zupload:
         )
         try:
             upload_reg.raise_for_status()
-        except requests.exceptions.HTTPError:
-            error_handler(self.zinstance, upload_reg)
+        except requests.exceptions.HTTPError as exc:
+            error_handler(self.zinstance, upload_reg, exc)
         backoff = upload_reg.headers.get("backoff") or upload_reg.headers.get(
             "retry-after"
         )

pyzotero-1.5.15.dist-info/AUTHORS

@@ -0,0 +1,2 @@
+# This is the official list of Pyzotero authors for copyright purposes.
+Stephan Hügel (<urschrei@gmail.com>)

{pyzotero-1.5.9.dist-info → pyzotero-1.5.15.dist-info}/METADATA

@@ -1,37 +1,56 @@
 Metadata-Version: 2.1
 Name: pyzotero
-Version: 1.5.9
+Version: 1.5.15
 Summary: Python wrapper for the Zotero API
-Home-page: https://github.com/urschrei/pyzotero
-Author: Stephan Hügel
-Author-email: urschrei@gmail.com
-License: MIT
-Project-URL: Source, https://github.com/urschrei/pyzotero
+Author-email: Stephan Hügel <urschrei@gmail.com>
+License: The MIT License (MIT)
+        
+        Copyright (c) 2015 Stephan Hügel
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in
+        all copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+        THE SOFTWARE.
+        
+Project-URL: Repository, https://github.com/urschrei/pyzotero
 Project-URL: Tracker, https://github.com/urschrei/pyzotero/issues
-Keywords: zotero
-Platform: UNKNOWN
+Keywords: Zotero,DH
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: Education
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown; charset=UTF-8
-License-File: license.txt
-Requires-Dist: bibtexparser
-Requires-Dist: feedparser (>=6)
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: AUTHORS
+Requires-Dist: feedparser >=6
 Requires-Dist: pytz
-Requires-Dist: requests (>=2.21.0)
-Provides-Extra: all
-Requires-Dist: pytest (>=6.2.2) ; extra == 'all'
+Requires-Dist: requests >=2.21.0
+Requires-Dist: bibtexparser
 Provides-Extra: test
-Requires-Dist: pytest (>=6.2.2) ; extra == 'test'
+Requires-Dist: pytest >=7.4.2 ; extra == 'test'
+Requires-Dist: httpretty ; extra == 'test'
+Requires-Dist: python-dateutil ; extra == 'test'
 
 [![Supported Python versions](https://img.shields.io/pypi/pyversions/Pyzotero.svg?style=flat)](https://pypi.python.org/pypi/Pyzotero/) [![Docs](https://readthedocs.org/projects/pyzotero/badge/?version=latest)](http://pyzotero.readthedocs.org/en/latest/?badge=latest) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](license.txt) [![PyPI Version](https://img.shields.io/pypi/v/Pyzotero.svg)](https://pypi.python.org/pypi/Pyzotero) [![Anaconda-Server Badge](https://anaconda.org/conda-forge/pyzotero/badges/version.svg)](https://anaconda.org/conda-forge/pyzotero) [![Downloads](https://pepy.tech/badge/pyzotero)](https://pepy.tech/project/pyzotero)  
 
@@ -121,5 +140,3 @@ Pyzotero is licensed under the [MIT license][8]. See [license.txt](license.txt)
 [10]: http://www.pip-installer.org/en/latest/index.html
 † This isn't strictly true: you only need an API key for personal libraries and non-public group libraries.
 
-
-

pyzotero-1.5.15.dist-info/RECORD

@@ -0,0 +1,9 @@
+_version.py,sha256=BffUs0zTnKVjgtY67ZB9bc6OL0FyBI7zUfWrc3U4Th4,276
+pyzotero/__init__.py,sha256=5QI4Jou9L-YJAf_oN9TgRXVKgt_Unc39oADo2Ch8bLI,243
+pyzotero/zotero.py,sha256=NBHf4eXDSnnIgu-9qcW2AV9BLs85VnspvP5luiyq6zo,75215
+pyzotero/zotero_errors.py,sha256=XzjUxKDQUMpRDBEQGTJ-wna0-bVoKIKK7AEDfKgzdfE,3664
+pyzotero-1.5.15.dist-info/AUTHORS,sha256=ZMicxg7lRScOYbxzMPznlzMbmrFIUIHwg-NvljEMbRQ,110
+pyzotero-1.5.15.dist-info/METADATA,sha256=LF0Fw6OLzZsxhOgsTfuYadFJ9f61lt_CCPaG809za3c,6570
+pyzotero-1.5.15.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+pyzotero-1.5.15.dist-info/top_level.txt,sha256=BOPNkPk5VtNDCy_li7Xftx6k0zG8STGxh-KgckcxLEw,18
+pyzotero-1.5.15.dist-info/RECORD,,

{pyzotero-1.5.9.dist-info → pyzotero-1.5.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{pyzotero-1.5.9.dist-info → pyzotero-1.5.15.dist-info}/top_level.txt

@@ -1 +1,2 @@
+_version
 pyzotero

pyzotero/version.py

@@ -1 +0,0 @@
-__version__ = "1.5.9"

pyzotero-1.5.9.dist-info/RECORD

@@ -1,9 +0,0 @@
-pyzotero/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyzotero/version.py,sha256=RHMW_abK7T5iTrsk1-qw4vMlruQeDezoKz9wbLkDSWk,22
-pyzotero/zotero.py,sha256=GcEof9c3Oab1ozszHlXttYR4va4F1h8GXtU5Jxgv3Gw,74840
-pyzotero/zotero_errors.py,sha256=XzjUxKDQUMpRDBEQGTJ-wna0-bVoKIKK7AEDfKgzdfE,3664
-pyzotero-1.5.9.dist-info/METADATA,sha256=sdRs37rB-G4QnMTWiixvI7bb8DtOnsK9mh-w-0-hATs,5341
-pyzotero-1.5.9.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-pyzotero-1.5.9.dist-info/license.txt,sha256=GkRsY7w5O74wcQX_wTlgXReyzsg9gGAhchpri3Na0wQ,1081
-pyzotero-1.5.9.dist-info/top_level.txt,sha256=uRY96N9ioKvXlbEGhzxxOAJnU8dm7KPE-156WiWf9R8,9
-pyzotero-1.5.9.dist-info/RECORD,,

pyzotero-1.5.9.dist-info/license.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Stephan Hügel
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.