chore: Run pyupgrade --py38-plus **/*.py

open-contracting · Oct 10, 2023 · 6522dac · 6522dac
1 parent ba1ae4b
commit 6522dac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/ocdsextensionregistry/codelist.py b/ocdsextensionregistry/codelist.py
@@ -60,8 +60,7 @@ def __getitem__(self, index):
         return self.rows[index]
 
     def __iter__(self):
-        for row in self.rows:
-            yield row
+        yield from self.rows
 
     def __len__(self):
         return len(self.rows)

diff --git a/ocdsextensionregistry/extension_registry.py b/ocdsextensionregistry/extension_registry.py
@@ -105,8 +105,7 @@ def __iter__(self):
         """
         Iterates over the extension versions in the registry.
         """
-        for version in self.versions:
-            yield version
+        yield from self.versions
 
     def _handle_attribute_error(self, e):
         if "'category'" in str(e.args) or "'core'" in str(e.args):

diff --git a/tests/test_codelist.py b/tests/test_codelist.py
@@ -47,10 +47,7 @@ def test_len():
 def test_repr():
     obj = fixture()
 
-    if sys.version_info >= (3, 8):
-        expected = "Codelist(name='test.csv', rows=[CodelistCode(data={'Code': 'open', 'Title': 'Open', 'Description': 'All interested suppliers may submit a tender.'}, extension_name='OCDS Core'), CodelistCode(data={'Code': 'selective', 'Title': 'Selective', 'Description': 'Only qualified suppliers are invited to submit a tender.'}, extension_name='OCDS Core'), CodelistCode(data={'Code': 'limited', 'Title': 'Limited', 'Description': 'The procuring entity contacts a number of suppliers of its choice.'}, extension_name='OCDS Core'), CodelistCode(data={'Code': 'direct', 'Title': 'Direct', 'Description': 'The contract is awarded to a single supplier without competition.'}, extension_name='OCDS Core')])"  # noqa: E501
-    else:
-        expected = "Codelist(name='test.csv', rows=[CodelistCode(data=OrderedDict([('Code', 'open'), ('Title', 'Open'), ('Description', 'All interested suppliers may submit a tender.')]), extension_name='OCDS Core'), CodelistCode(data=OrderedDict([('Code', 'selective'), ('Title', 'Selective'), ('Description', 'Only qualified suppliers are invited to submit a tender.')]), extension_name='OCDS Core'), CodelistCode(data=OrderedDict([('Code', 'limited'), ('Title', 'Limited'), ('Description', 'The procuring entity contacts a number of suppliers of its choice.')]), extension_name='OCDS Core'), CodelistCode(data=OrderedDict([('Code', 'direct'), ('Title', 'Direct'), ('Description', 'The contract is awarded to a single supplier without competition.')]), extension_name='OCDS Core')])"  # noqa: E501
+    expected = "Codelist(name='test.csv', rows=[CodelistCode(data={'Code': 'open', 'Title': 'Open', 'Description': 'All interested suppliers may submit a tender.'}, extension_name='OCDS Core'), CodelistCode(data={'Code': 'selective', 'Title': 'Selective', 'Description': 'Only qualified suppliers are invited to submit a tender.'}, extension_name='OCDS Core'), CodelistCode(data={'Code': 'limited', 'Title': 'Limited', 'Description': 'The procuring entity contacts a number of suppliers of its choice.'}, extension_name='OCDS Core'), CodelistCode(data={'Code': 'direct', 'Title': 'Direct', 'Description': 'The contract is awarded to a single supplier without competition.'}, extension_name='OCDS Core')])"  # noqa: E501
 
     assert repr(obj) == expected