feat: Add PyPy 3.7 support

open-contracting · Jul 16, 2021 · 70e2a33 · 70e2a33
1 parent 2bf970d
commit 70e2a33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.6.7 (Unreleased)
+------------------
+
+Added
+~~~~~
+
+-  Add PyPy 3.7 support.
+
 0.6.6 (2021-04-10)
 ------------------
 

diff --git a/ocdsmerge/util.py b/ocdsmerge/util.py
@@ -40,7 +40,8 @@ def sorted_releases(releases):
                 raise NullDateValueError('The `date` field of at least one release is null.')
             else:
                 raise NonStringDateValueError('The `date` field of at least one release is not a string.')
-        elif e.args[0] == 'string indices must be integers':
+        elif e.args[0] in ('string indices must be integers',
+                           'string index indices must be integers or slices, not str'):
             raise NonObjectReleaseError('At least one release is a string, not a dict. Use `json.loads` to parse the '
                                         'string as JSON.')
         elif e.args[0] == 'byte indices must be integers or slices, not str':
@@ -50,7 +51,8 @@ def sorted_releases(releases):
             raise NonObjectReleaseError('At least one release is a list, not a dict.')
         elif e.args[0] == 'tuple indices must be integers or slices, not str':
             raise NonObjectReleaseError('At least one release is a tuple, not a dict.')
-        elif e.args[0] == "'set' object is not subscriptable":
+        elif e.args[0] in ("'set' object is not subscriptable",
+                           "'set' object is not subscriptable (key 'date')"):
             raise NonObjectReleaseError('At least one release is a set, not a dict.')
         else:
             raise