pyzotero 1.6.6__py3-none-any.whl → 1.6.7__py3-none-any.whl

_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.6'
-__version_tuple__ = version_tuple = (1, 6, 6)
+__version__ = version = '1.6.7'
+__version_tuple__ = version_tuple = (1, 6, 7)

pyzotero/zotero.py

@@ -40,6 +40,7 @@ import feedparser
 import httpx
 import pytz
 from httpx import Request
+from httpx_file import Client as File_Client
 
 import pyzotero as pz
 
@@ -190,38 +191,9 @@ def retrieve(func):
             and self.content.search(str(self.request.url)).group(0)
             or "bib"
         )
-        # JSON by default
-        formats = {
-            "application/atom+xml": "atom",
-            "application/x-bibtex": "bibtex",
-            "application/json": "json",
-            "text/html": "snapshot",
-            "text/plain": "plain",
-            "application/pdf; charset=utf-8": "pdf",
-            "application/pdf": "pdf",
-            "application/msword": "doc",
-            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "docx",
-            "application/vnd.openxmlformats-officedocument.presentationml.presentation": "pptx",
-            "application/zip": "zip",
-            "application/epub+zip": "zip",
-            "audio/mpeg": "mp3",
-            "video/mp4": "mp4",
-            "audio/x-wav": "wav",
-            "video/x-msvideo": "avi",
-            "application/octet-stream": "octet",
-            "application/x-tex": "tex",
-            "application/x-texinfo": "texinfo",
-            "image/jpeg": "jpeg",
-            "image/png": "png",
-            "image/gif": "gif",
-            "image/tiff": "tiff",
-            "application/postscript": "postscript",
-            "application/rtf": "rtf",
-        }
         # select format, or assume JSON
         content_type_header = self.request.headers["Content-Type"].lower() + ";"
-        fmt = formats.get(
+        fmt = self.formats.get(
             # strip "; charset=..." segment
             content_type_header[0 : content_type_header.index(";")],
             "json",
@@ -321,12 +293,44 @@ class Zotero:
         self.tag_data = False
         self.request = None
         self.snapshot = False
-        self.client = httpx.Client(headers=self.default_headers())
+        self.client = httpx.Client(
+            headers=self.default_headers(), follow_redirects=True
+        )
         # these aren't valid item fields, so never send them to the server
         self.temp_keys = set(["key", "etag", "group_id", "updated"])
         # determine which processor to use for the parsed content
         self.fmt = re.compile(r"(?<=format=)\w+")
         self.content = re.compile(r"(?<=content=)\w+")
+        # JSON by default
+        self.formats = {
+            "application/atom+xml": "atom",
+            "application/x-bibtex": "bibtex",
+            "application/json": "json",
+            "text/html": "snapshot",
+            "text/plain": "plain",
+            "text/markdown": "plain",
+            "application/pdf; charset=utf-8": "pdf",
+            "application/pdf": "pdf",
+            "application/msword": "doc",
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "docx",
+            "application/vnd.openxmlformats-officedocument.presentationml.presentation": "pptx",
+            "application/zip": "zip",
+            "application/epub+zip": "zip",
+            "audio/mpeg": "mp3",
+            "video/mp4": "mp4",
+            "audio/x-wav": "wav",
+            "video/x-msvideo": "avi",
+            "application/octet-stream": "octet",
+            "application/x-tex": "tex",
+            "application/x-texinfo": "texinfo",
+            "image/jpeg": "jpeg",
+            "image/png": "png",
+            "image/gif": "gif",
+            "image/tiff": "tiff",
+            "application/postscript": "postscript",
+            "application/rtf": "rtf",
+        }
         self.processors = {
             "bib": self._bib_processor,
             "citation": self._citation_processor,
@@ -479,13 +483,28 @@ class Zotero:
         # Unfortunately, httpx doesn't like to merge query paramaters in the url string and passed params
         # so we strip the url params, combining them with our existing url_params
         final_url, final_params = merge_params(full_url, merged_params)
-        self.request = self.client.get(
-            url=final_url,
-            params=final_params,
-            headers=self.default_headers(),
-            timeout=timeout,
-        )
-        self.request.encoding = "utf-8"
+        # file URI errors are raised immediately so we have to try here
+        try:
+            self.request = self.client.get(
+                url=final_url,
+                params=final_params,
+                headers=self.default_headers(),
+                timeout=timeout,
+            )
+            self.request.encoding = "utf-8"
+        except httpx.UnsupportedProtocol:
+            # File URI handler logic
+            fc = File_Client()
+            request = fc.get(
+                url=final_url,
+                params=final_params,
+                headers=self.default_headers(),
+                timeout=timeout,
+                follow_redirects=True,
+            )
+            self.request = request
+            # since we'll be writing bytes, we need to set this to a type that will trigger the bytes processor
+            self.request.headers["Content-Type"] = "text/plain"
         try:
             self.request.raise_for_status()
         except httpx.HTTPError as exc:

{pyzotero-1.6.6.dist-info → pyzotero-1.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyzotero
-Version: 1.6.6
+Version: 1.6.7
 Summary: Python wrapper for the Zotero API
 Author-email: Stephan Hügel <urschrei@gmail.com>
 License: # Blue Oak Model License
@@ -63,6 +63,7 @@ Requires-Dist: feedparser>=6.0.11
 Requires-Dist: pytz
 Requires-Dist: bibtexparser
 Requires-Dist: httpx>=0.28.1
+Requires-Dist: httpx-file>=0.2.0
 Provides-Extra: test
 Requires-Dist: pytest>=7.4.2; extra == "test"
 Requires-Dist: httpretty; extra == "test"

pyzotero-1.6.7.dist-info/RECORD

@@ -0,0 +1,10 @@
+_version.py,sha256=UBH9kvxesdE0svvcKwHfK8rz5bJUzNXPBHo7APqVEfk,411
+pyzotero/__init__.py,sha256=5QI4Jou9L-YJAf_oN9TgRXVKgt_Unc39oADo2Ch8bLI,243
+pyzotero/zotero.py,sha256=alCXV2WAagw6EL8nAJ4y9iZ3FFIE3-wJeCMYRbh1XTU,77343
+pyzotero/zotero_errors.py,sha256=UPhAmf2K05cnoeIl2wjufWQedepg7vBKb-ShU0TdlL4,2582
+pyzotero-1.6.7.dist-info/AUTHORS,sha256=ZMicxg7lRScOYbxzMPznlzMbmrFIUIHwg-NvljEMbRQ,110
+pyzotero-1.6.7.dist-info/LICENSE.md,sha256=bhy1CPMj1zWffD9YifFmSeBzPylsrhb1qP8OCEx5Etw,1550
+pyzotero-1.6.7.dist-info/METADATA,sha256=dR-omf9ajswDWyICEkqL_FCs_Y08c2G-TLO3zYAUkHE,7323
+pyzotero-1.6.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pyzotero-1.6.7.dist-info/top_level.txt,sha256=BOPNkPk5VtNDCy_li7Xftx6k0zG8STGxh-KgckcxLEw,18
+pyzotero-1.6.7.dist-info/RECORD,,

pyzotero-1.6.6.dist-info/RECORD

@@ -1,10 +0,0 @@
-_version.py,sha256=Nz1l8vGPOAOAlxWDepNu28nfH9fOKk0GnGSnVyZJsFE,411
-pyzotero/__init__.py,sha256=5QI4Jou9L-YJAf_oN9TgRXVKgt_Unc39oADo2Ch8bLI,243
-pyzotero/zotero.py,sha256=9mwSEa3Z97Bdni9p_yMqeKBEYQFUvRdwFJAIaf0gg5A,76539
-pyzotero/zotero_errors.py,sha256=UPhAmf2K05cnoeIl2wjufWQedepg7vBKb-ShU0TdlL4,2582
-pyzotero-1.6.6.dist-info/AUTHORS,sha256=ZMicxg7lRScOYbxzMPznlzMbmrFIUIHwg-NvljEMbRQ,110
-pyzotero-1.6.6.dist-info/LICENSE.md,sha256=bhy1CPMj1zWffD9YifFmSeBzPylsrhb1qP8OCEx5Etw,1550
-pyzotero-1.6.6.dist-info/METADATA,sha256=fw5aXyuKKiBOUD74CbxLzmDDZcqw-E9XBV-HNecB0W8,7290
-pyzotero-1.6.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pyzotero-1.6.6.dist-info/top_level.txt,sha256=BOPNkPk5VtNDCy_li7Xftx6k0zG8STGxh-KgckcxLEw,18
-pyzotero-1.6.6.dist-info/RECORD,,