commonmeta-py 0.107__py3-none-any.whl → 0.108__py3-none-any.whl

commonmeta/writers/bibtex_writer.py

@@ -1,15 +1,15 @@
 """Bibtex writer for commonmeta-py"""
 
-from bibtexparser.bwriter import BibTexWriter
 from bibtexparser.bibdatabase import BibDatabase
+from bibtexparser.bwriter import BibTexWriter
 from bibtexparser.customization import page_double_hyphen
 
-from ..utils import pages_as_string, get_language
-from ..base_utils import compact
 from ..author_utils import authors_as_string
-from ..date_utils import get_month_from_date, get_iso8601_date, MONTH_SHORT_NAMES
-from ..doi_utils import doi_from_url
+from ..base_utils import compact
 from ..constants import CM_TO_BIB_TRANSLATIONS, Commonmeta
+from ..date_utils import MONTH_SHORT_NAMES, get_iso8601_date, get_month_from_date
+from ..doi_utils import doi_from_url
+from ..utils import get_language, pages_as_string
 
 
 def write_bibtex(metadata: Commonmeta) -> str:

commonmeta/writers/commonmeta_writer.py

@@ -1,7 +1,5 @@
 """Commonmeta writer for commonmeta-py"""
 
-import orjson as json
-import orjsonl
 import pydash as py_
 
 from ..base_utils import compact
@@ -33,12 +31,12 @@ def write_commonmeta(metadata):
             "funding_references": "fundingReferences",
         },
     )
-    return json.dumps(compact(data), option=json.OPT_INDENT_2)
+    return compact(data)
 
 
 def write_commonmeta_list(metalist):
-    """Write commonmeta list. If filename is provided,
-    write to file. Optionally, use JSON Lines format."""
+    """Write commonmeta list. If file is provided,
+    write to file. Supports JSON, JSON Lines and YAML format."""
     if metalist is None:
         return None
 
@@ -48,7 +46,7 @@ def write_commonmeta_list(metalist):
         return compact(item)
 
     items = [format_item(item) for item in metalist.items]
-    output = compact(
+    return compact(
         {
             "id": metalist.id,
             "title": metalist.title,
@@ -56,14 +54,3 @@ def write_commonmeta_list(metalist):
             "items": items,
         }
     )
-
-    if metalist.filename and metalist.filename.rsplit(".", 1)[1] in ["jsonl", "json"]:
-        if metalist.jsonlines:
-            orjsonl.save(metalist.filename, items)
-        else:
-            json_output = json.dumps(output).decode("utf-8")
-            with open(metalist.filename, "w") as file:
-                file.write(json_output)
-        return metalist.filename
-    else:
-        return json.dumps(output).decode("utf-8")