bibtexparser 2.0.0b4__tar.gz → 2.0.0b5__tar.gz

{bibtexparser-2.0.0b4 → bibtexparser-2.0.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bibtexparser
-Version: 2.0.0b4
+Version: 2.0.0b5
 Summary: Bibtex parser for python 3
 Home-page: https://github.com/sciunto-org/python-bibtexparser
 Author: Michael Weiss and other contributors
@@ -35,7 +35,7 @@ Welcome to python-bibtexparser, a parser for `.bib` files with a long history an
 Bibtexparser is available in two versions: V1 and V2. For new projects, we recommend using v2 which, in the long run, will provide an overall more robust and faster experience. **For now, however, note that v2 is an early beta, and does not contain all features of v1**. Install v2 using pip:
 
 ```bash
-pip install python-bibtexparser --pre
+pip install bibtexparser --pre
 ```
 
 Or you can install the latest development version directly from the main branch:

{bibtexparser-2.0.0b4 → bibtexparser-2.0.0b5}/README.md

@@ -5,7 +5,7 @@ Welcome to python-bibtexparser, a parser for `.bib` files with a long history an
 Bibtexparser is available in two versions: V1 and V2. For new projects, we recommend using v2 which, in the long run, will provide an overall more robust and faster experience. **For now, however, note that v2 is an early beta, and does not contain all features of v1**. Install v2 using pip:
 
 ```bash
-pip install python-bibtexparser --pre
+pip install bibtexparser --pre
 ```
 
 Or you can install the latest development version directly from the main branch:

{bibtexparser-2.0.0b4 → bibtexparser-2.0.0b5}/bibtexparser/__init__.py

@@ -4,3 +4,5 @@ import bibtexparser.model
 from bibtexparser.entrypoint import parse_file, parse_string, write_file, write_string
 from bibtexparser.library import Library
 from bibtexparser.writer import BibtexFormat
+
+__version__ = "2.0.0b5"

{bibtexparser-2.0.0b4 → bibtexparser-2.0.0b5}/bibtexparser/library.py

@@ -24,7 +24,9 @@ class Library:
         if blocks is not None:
             self.add(blocks)
 
-    def add(self, blocks: Union[List[Block], Block]):
+    def add(
+        self, blocks: Union[List[Block], Block], fail_on_duplicate_key: bool = False
+    ):
         """Add blocks to library.
 
         The adding is key-safe, i.e., it is made sure that no duplicate keys are added.
@@ -32,14 +34,30 @@ class Library:
         a DuplicateKeyBlock.
 
         :param blocks: Block or list of blocks to add.
+        :param fail_on_duplicate_key: If True, raises ValueError if a block was replaced with a DuplicateKeyBlock.
         """
         if isinstance(blocks, Block):
             blocks = [blocks]
 
+        _added_blocks = []
         for block in blocks:
             # This may replace block with a DuplicateEntryKeyBlock
             block = self._add_to_dicts(block)
             self._blocks.append(block)
+            _added_blocks.append(block)
+
+        if fail_on_duplicate_key:
+            duplicate_keys = []
+            for original, added in zip(blocks, _added_blocks):
+                if not original is added and isinstance(added, DuplicateBlockKeyBlock):
+                    duplicate_keys.append(added.key)
+
+            if len(duplicate_keys) > 0:
+                raise ValueError(
+                    f"Duplicate keys found: {duplicate_keys}. "
+                    f"Duplicate entries have been added to the library as DuplicateBlockKeyBlock."
+                    f"Use `library.failed_blocks` to access them. "
+                )
 
     def remove(self, blocks: Union[List[Block], Block]):
         """Remove blocks from library.
@@ -73,19 +91,19 @@ class Library:
         except ValueError:
             raise ValueError("Block to replace is not in library.")
 
-        self._blocks.insert(index, new_block)
         block_after_add = self._add_to_dicts(new_block)
+        self._blocks.insert(index, block_after_add)
 
         if (
             new_block is not block_after_add
-            and isinstance(new_block, DuplicateBlockKeyBlock)
+            and isinstance(block_after_add, DuplicateBlockKeyBlock)
             and fail_on_duplicate_key
         ):
             # Revert changes to old_block
             #   Don't fail on duplicate key, as this would lead to an infinite recursion
             #   (should never happen for a clean library, but could happen if the user
             #   tampered with the internals of the library).
-            self.replace(new_block, old_block, fail_on_duplicate_key=False)
+            self.replace(block_after_add, old_block, fail_on_duplicate_key=False)
             raise ValueError("Duplicate key found.")
 
     @staticmethod
@@ -160,7 +178,9 @@ class Library:
     @property
     def entries(self) -> List[Entry]:
         """All entry (@article, ...) blocks in the library, preserving order of insertion."""
-        return list(self._entries_by_key.values())
+        # Note: Taking this from the entries dict would be faster, but does not preserve order
+        #   e.g. in cases where `replace` has been called.
+        return [b for b in self._blocks if isinstance(b, Entry)]
 
     @property
     def entries_dict(self) -> Dict[str, Entry]:

{bibtexparser-2.0.0b4 → bibtexparser-2.0.0b5}/bibtexparser/middlewares/names.py

@@ -424,11 +424,17 @@ def parse_single_name_into_parts(name, strict=True):
         else:
             lcases = cases[0]
 
-            #
+            def rindex(l, x, default):
+                """Returns the index of the rightmost occurence of x in l."""
+                for i in range(len(l) - 1, -1, -1):
+                    if l[i] == x:
+                        return i
+                return default
+
+            # Check if at least one of the words is lowercase
             if 0 in lcases:
-                split = len(lcases) - lcases[::-1].index(0)
-                if split == len(lcases):
-                    split = 0  # Last cannot be empty.
+                # Excluding the last word, find the index of the last lower word
+                split = rindex(lcases[:-1], 0, -1) + 1
                 parts.von = sections[0][:split]
                 parts.last = sections[0][split:]
 

{bibtexparser-2.0.0b4 → bibtexparser-2.0.0b5}/bibtexparser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bibtexparser
-Version: 2.0.0b4
+Version: 2.0.0b5
 Summary: Bibtex parser for python 3
 Home-page: https://github.com/sciunto-org/python-bibtexparser
 Author: Michael Weiss and other contributors
@@ -35,7 +35,7 @@ Welcome to python-bibtexparser, a parser for `.bib` files with a long history an
 Bibtexparser is available in two versions: V1 and V2. For new projects, we recommend using v2 which, in the long run, will provide an overall more robust and faster experience. **For now, however, note that v2 is an early beta, and does not contain all features of v1**. Install v2 using pip:
 
 ```bash
-pip install python-bibtexparser --pre
+pip install bibtexparser --pre
 ```
 
 Or you can install the latest development version directly from the main branch:

{bibtexparser-2.0.0b4 → bibtexparser-2.0.0b5}/bibtexparser.egg-info/SOURCES.txt

@@ -24,5 +24,6 @@ bibtexparser/middlewares/parsestack.py
 bibtexparser/middlewares/sorting_blocks.py
 bibtexparser/middlewares/sorting_entry_fields.py
 tests/test_entrypoint.py
+tests/test_library.py
 tests/test_model.py
 tests/test_writer.py

{bibtexparser-2.0.0b4 → bibtexparser-2.0.0b5}/setup.py

@@ -1,13 +1,15 @@
 #!/usr/bin/env python
 import setuptools
 
-version = "2.0.0b4"
+version = None
 
 with open("bibtexparser/__init__.py") as fh:
     for line in fh:
         if line.startswith("__version__"):
             version = line.strip().split()[-1][1:-1]
             break
+    if not version:
+        raise RuntimeError("Could not determine version")
 
 
 def load_readme():

bibtexparser-2.0.0b5/tests/test_library.py

@@ -0,0 +1,75 @@
+from copy import deepcopy
+
+import pytest
+
+from bibtexparser import Library
+from bibtexparser.model import Entry, Field
+
+
+def get_dummy_entry():
+    return Entry(
+        entry_type="article",
+        key="duplicateKey",
+        fields=[
+            Field(key="title", value="A title"),
+            Field(key="author", value="An author"),
+        ],
+    )
+
+
+def test_replace_with_duplicates():
+    """Test that replace() works when there are duplicate values. See issue 404."""
+    library = Library()
+    library.add(get_dummy_entry())
+    library.add(get_dummy_entry())
+    # Test precondition
+    assert len(library.blocks) == 2
+    assert len(library.failed_blocks) == 1
+
+    replacement_entry = get_dummy_entry()
+    replacement_entry.fields_dict["title"].value = "A new title"
+
+    library.replace(
+        library.failed_blocks[0], replacement_entry, fail_on_duplicate_key=False
+    )
+    assert len(library.blocks) == 2
+    assert len(library.failed_blocks) == 1
+    assert library.failed_blocks[0].ignore_error_block["title"] == "A new title"
+
+    replacement_entry_2 = get_dummy_entry()
+    replacement_entry_2.fields_dict["title"].value = "Another new title"
+
+    library.replace(
+        library.entries[0], replacement_entry_2, fail_on_duplicate_key=False
+    )
+    assert len(library.blocks) == 2
+    assert len(library.failed_blocks) == 1
+    # The new block replaces the previous "non-duplicate" and should thus not become a duplicate itself
+    assert library.entries[0].fields_dict["title"].value == "Another new title"
+
+
+def test_replace_fail_on_duplicate():
+    library = Library()
+    replaceable_entry = get_dummy_entry()
+    replaceable_entry.key = "Just a regular entry, to be replaced"
+    future_duplicate_entry = get_dummy_entry()
+    library.add([replaceable_entry, future_duplicate_entry])
+
+    with pytest.raises(ValueError):
+        library.replace(
+            replaceable_entry, get_dummy_entry(), fail_on_duplicate_key=True
+        )
+
+    assert len(library.blocks) == 2
+    assert len(library.failed_blocks) == 0
+    assert library.entries[0].key == "Just a regular entry, to be replaced"
+    assert library.entries[1].key == "duplicateKey"
+
+
+def test_fail_on_duplicate_add():
+    library = Library()
+    library.add(get_dummy_entry())
+    with pytest.raises(ValueError):
+        library.add(get_dummy_entry(), fail_on_duplicate_key=True)
+    assert len(library.blocks) == 2
+    assert len(library.failed_blocks) == 1