udata 9.1.2.dev30754__py2.py3-none-any.whl → 9.1.4.dev30983__py2.py3-none-any.whl

udata/search/query.py

@@ -3,7 +3,7 @@ import logging
 import urllib.parse
 
 import requests
-from flask import current_app, request, url_for
+from flask import current_app, request
 
 from udata.search.result import SearchResult
 

udata/sentry.py

@@ -8,7 +8,9 @@ from werkzeug.exceptions import HTTPException
 from udata import entrypoints
 from udata.core.storages.api import UploadProgress
 
+from .app import UDataApp
 from .auth import PermissionDenied
+from .frontend import package_version
 
 log = logging.getLogger(__name__)
 
@@ -24,7 +26,7 @@ ERROR_PARSE_DSN_MSG = "Unable to parse Sentry DSN"
 IGNORED_EXCEPTIONS = HTTPException, PermissionDenied, UploadProgress
 
 
-def public_dsn(dsn):
+def public_dsn(dsn: str) -> str | None:
     """Check if DSN is public or raise a warning and turn it into a public one"""
     m = RE_DSN.match(dsn)
     if not m:
@@ -41,7 +43,7 @@ def public_dsn(dsn):
     return public
 
 
-def init_app(app):
+def init_app(app: UDataApp):
     if app.config["SENTRY_DSN"]:
         try:
             import sentry_sdk
@@ -62,6 +64,13 @@ def init_app(app):
             dsn=app.config["SENTRY_PUBLIC_DSN"],
             integrations=[FlaskIntegration(), CeleryIntegration()],
             ignore_errors=list(exceptions),
+            release=f"udata@{package_version('udata')}",
+            environment=app.config.get("SITE_ID", None),
+            # Set traces_sample_rate to 1.0 to capture 100%
+            # of transactions for performance monitoring.
+            # Sentry recommends adjusting this value in production.
+            traces_sample_rate=app.config.get("SENTRY_SAMPLE_RATE", None),
+            profiles_sample_rate=app.config.get("SENTRY_SAMPLE_RATE", None),
         )
 
         # Set log level

udata/settings.py

@@ -113,6 +113,7 @@ class Defaults(object):
     SENTRY_USER_ATTRS = ["slug", "email", "fullname"]
     SENTRY_LOGGING = "WARNING"
     SENTRY_IGNORE_EXCEPTIONS = []
+    SENTRY_SAMPLE_RATE: float = 1.0
 
     # Flask WTF settings
     CSRF_SESSION_KEY = "Default uData csrf key"

udata/tags.py

@@ -6,11 +6,11 @@ MIN_TAG_LENGTH = LocalProxy(lambda: current_app.config["TAG_MIN_LENGTH"])
 MAX_TAG_LENGTH = LocalProxy(lambda: current_app.config["TAG_MAX_LENGTH"])
 
 
-def slug(value):
+def slug(value: str) -> str:
     return slugify(value.lower())
 
 
-def normalize(value):
+def normalize(value: str) -> str:
     value = slug(value)
     if len(value) < MIN_TAG_LENGTH:
         value = ""
@@ -19,5 +19,5 @@ def normalize(value):
     return value
 
 
-def tags_list(value):
+def tags_list(value: str) -> list:
     return list(set(slug(tag) for tag in value.split(",") if tag.strip()))

udata/tests/api/test_base_api.py

@@ -1,7 +1,7 @@
 from flask import url_for
 
 from udata.api import API, api
-from udata.forms import Form, fields
+from udata.forms import Form
 
 from . import APITestCase
 

udata/tests/api/test_contact_points.py

@@ -14,18 +14,18 @@ class ContactPointAPITest:
     modules = []
 
     def test_contact_point_api_update(self, api):
-        user = api.login()
+        api.login()
         contact_point = ContactPointFactory()
         data = contact_point.to_dict()
         data["email"] = "new.email@newdomain.com"
         response = api.put(url_for("api.contact_point", contact_point=contact_point), data)
         assert200(response)
-        assert ContactPoint.objects.count() is 1
+        assert ContactPoint.objects.count() == 1
         assert ContactPoint.objects.first().email == "new.email@newdomain.com"
 
     def test_contact_point_api_delete(self, api):
-        user = api.login()
+        api.login()
         contact_point = ContactPointFactory()
         response = api.delete(url_for("api.contact_point", contact_point=contact_point))
         assert204(response)
-        assert ContactPoint.objects.count() is 0
+        assert ContactPoint.objects.count() == 0

udata/tests/api/test_datasets_api.py

@@ -42,7 +42,7 @@ from udata.i18n import gettext as _
 from udata.models import CommunityResource, Dataset, Follow, Member, db
 from udata.tags import MAX_TAG_LENGTH, MIN_TAG_LENGTH
 from udata.tests.features.territories import create_geozones_fixtures
-from udata.tests.helpers import assert200, assert204, assert404
+from udata.tests.helpers import assert200, assert404
 from udata.utils import faker, unique_string
 
 from . import APITestCase
@@ -839,7 +839,7 @@ class DatasetAPITest(APITestCase):
         dataset.reload()
         assert dataset.resources[0].schema["url"] == "http://example.com"
         assert dataset.resources[0].schema["name"] == "etalab/schema-irve-statique"
-        assert dataset.resources[0].schema["version"] == None
+        assert dataset.resources[0].schema["version"] is None
 
         resource_data["schema"] = {"name": "etalab/schema-irve-statique"}
         data["resources"].append(resource_data)
@@ -848,8 +848,8 @@ class DatasetAPITest(APITestCase):
 
         dataset.reload()
         assert dataset.resources[0].schema["name"] == "etalab/schema-irve-statique"
-        assert dataset.resources[0].schema["url"] == None
-        assert dataset.resources[0].schema["version"] == None
+        assert dataset.resources[0].schema["url"] is None
+        assert dataset.resources[0].schema["version"] is None
 
         resource_data["schema"] = {"name": "etalab/schema-irve-statique", "version": "2.2.0"}
         data["resources"].append(resource_data)
@@ -858,7 +858,7 @@ class DatasetAPITest(APITestCase):
 
         dataset.reload()
         assert dataset.resources[0].schema["name"] == "etalab/schema-irve-statique"
-        assert dataset.resources[0].schema["url"] == None
+        assert dataset.resources[0].schema["url"] is None
         assert dataset.resources[0].schema["version"] == "2.2.0"
 
         resource_data["schema"] = {
@@ -870,7 +870,7 @@ class DatasetAPITest(APITestCase):
 
         dataset.reload()
         assert dataset.resources[0].schema["name"] == "etalab/schema-irve-statique"
-        assert dataset.resources[0].schema["url"] == None
+        assert dataset.resources[0].schema["url"] is None
         assert dataset.resources[0].schema["version"] == "2.2.1"
 
         # Putting `None` as the schema argument do not remove the schema
@@ -884,7 +884,7 @@ class DatasetAPITest(APITestCase):
 
         dataset.reload()
         assert dataset.resources[0].schema["name"] == "etalab/schema-irve-statique"
-        assert dataset.resources[0].schema["url"] == None
+        assert dataset.resources[0].schema["url"] is None
         assert dataset.resources[0].schema["version"] == "2.2.1"
 
         # Putting `None` as the schema name and version remove the schema
@@ -897,9 +897,9 @@ class DatasetAPITest(APITestCase):
         self.assert200(response)
 
         dataset.reload()
-        assert dataset.resources[0].schema["name"] == None
-        assert dataset.resources[0].schema["url"] == None
-        assert dataset.resources[0].schema["version"] == None
+        assert dataset.resources[0].schema["name"] is None
+        assert dataset.resources[0].schema["url"] is None
+        assert dataset.resources[0].schema["version"] is None
 
 
 class DatasetBadgeAPITest(APITestCase):

udata/tests/api/test_organizations_api.py

@@ -72,7 +72,7 @@ class OrganizationAPITest:
         user = api.login()
         response = api.post(url_for("api.organizations"), data)
         assert201(response)
-        assert Organization.objects.count() is 1
+        assert Organization.objects.count() == 1
 
         org = Organization.objects.first()
         member = org.member(user)
@@ -89,7 +89,7 @@ class OrganizationAPITest:
         data["description"] = "new description"
         response = api.put(url_for("api.organization", org=org), data)
         assert200(response)
-        assert Organization.objects.count() is 1
+        assert Organization.objects.count() == 1
         assert Organization.objects.first().description == "new description"
 
     def test_organization_api_update_business_number_id(self, api):
@@ -101,7 +101,7 @@ class OrganizationAPITest:
         data["business_number_id"] = "13002526500013"
         response = api.put(url_for("api.organization", org=org), data)
         assert200(response)
-        assert Organization.objects.count() is 1
+        assert Organization.objects.count() == 1
         assert Organization.objects.first().business_number_id == "13002526500013"
 
     def test_organization_api_update_business_number_id_failing(self, api):
@@ -147,7 +147,7 @@ class OrganizationAPITest:
         api.login()
         response = api.put(url_for("api.organization", org=org), data)
         assert403(response)
-        assert Organization.objects.count() is 1
+        assert Organization.objects.count() == 1
         assert Organization.objects.first().description == org.description
 
     def test_organization_api_delete(self, api):
@@ -157,7 +157,7 @@ class OrganizationAPITest:
         org = OrganizationFactory(members=[member])
         response = api.delete(url_for("api.organization", org=org))
         assert204(response)
-        assert Organization.objects.count() is 1
+        assert Organization.objects.count() == 1
         assert Organization.objects[0].deleted is not None
 
     def test_organization_api_delete_deleted(self, api):
@@ -175,7 +175,7 @@ class OrganizationAPITest:
         org = OrganizationFactory(members=[member])
         response = api.delete(url_for("api.organization", org=org))
         assert403(response)
-        assert Organization.objects.count() is 1
+        assert Organization.objects.count() == 1
         assert Organization.objects[0].deleted is None
 
     def test_organization_api_delete_as_non_member_forbidden(self, api):
@@ -184,7 +184,7 @@ class OrganizationAPITest:
         org = OrganizationFactory()
         response = api.delete(url_for("api.organization", org=org))
         assert403(response)
-        assert Organization.objects.count() is 1
+        assert Organization.objects.count() == 1
         assert Organization.objects[0].deleted is None
 
 
@@ -200,10 +200,10 @@ class MembershipAPITest:
         assert201(response)
 
         organization.reload()
-        assert len(organization.requests) is 1
-        assert len(organization.pending_requests) is 1
-        assert len(organization.refused_requests) is 0
-        assert len(organization.accepted_requests) is 0
+        assert len(organization.requests) == 1
+        assert len(organization.pending_requests) == 1
+        assert len(organization.refused_requests) == 0
+        assert len(organization.accepted_requests) == 0
 
         request = organization.requests[0]
         assert request.user == user
@@ -223,10 +223,10 @@ class MembershipAPITest:
         assert200(response)
 
         organization.reload()
-        assert len(organization.requests) is 1
-        assert len(organization.pending_requests) is 1
-        assert len(organization.refused_requests) is 0
-        assert len(organization.accepted_requests) is 0
+        assert len(organization.requests) == 1
+        assert len(organization.pending_requests) == 1
+        assert len(organization.refused_requests) == 0
+        assert len(organization.accepted_requests) == 0
 
         request = organization.requests[0]
         assert request.user == user
@@ -326,10 +326,10 @@ class MembershipAPITest:
         assert response.json["role"] == "editor"
 
         organization.reload()
-        assert len(organization.requests) is 1
-        assert len(organization.pending_requests) is 0
-        assert len(organization.refused_requests) is 0
-        assert len(organization.accepted_requests) is 1
+        assert len(organization.requests) == 1
+        assert len(organization.pending_requests) == 0
+        assert len(organization.refused_requests) == 0
+        assert len(organization.accepted_requests) == 1
         assert organization.is_member(applicant)
 
         request = organization.requests[0]
@@ -380,10 +380,10 @@ class MembershipAPITest:
         assert200(response)
 
         organization.reload()
-        assert len(organization.requests) is 1
-        assert len(organization.pending_requests) is 0
-        assert len(organization.refused_requests) is 1
-        assert len(organization.accepted_requests) is 0
+        assert len(organization.requests) == 1
+        assert len(organization.pending_requests) == 0
+        assert len(organization.refused_requests) == 1
+        assert len(organization.accepted_requests) == 0
         assert not organization.is_member(applicant)
 
         request = organization.requests[0]
@@ -548,12 +548,12 @@ class MembershipAPITest:
         to_follow.count_followers()
         assert to_follow.get_metrics()["followers"] == 1
 
-        assert Follow.objects.following(to_follow).count() is 0
-        assert Follow.objects.followers(to_follow).count() is 1
+        assert Follow.objects.following(to_follow).count() == 0
+        assert Follow.objects.followers(to_follow).count() == 1
         follow = Follow.objects.followers(to_follow).first()
         assert isinstance(follow.following, Organization)
-        assert Follow.objects.following(user).count() is 1
-        assert Follow.objects.followers(user).count() is 0
+        assert Follow.objects.following(user).count() == 1
+        assert Follow.objects.followers(user).count() == 0
 
     def test_unfollow_org(self, api):
         """It should unfollow the organization on DELETE"""
@@ -567,12 +567,12 @@ class MembershipAPITest:
 
         nb_followers = Follow.objects.followers(to_follow).count()
 
-        assert nb_followers is 0
+        assert nb_followers == 0
         assert response.json["followers"] == nb_followers
 
-        assert Follow.objects.following(to_follow).count() is 0
-        assert Follow.objects.following(user).count() is 0
-        assert Follow.objects.followers(user).count() is 0
+        assert Follow.objects.following(to_follow).count() == 0
+        assert Follow.objects.following(user).count() == 0
+        assert Follow.objects.followers(user).count() == 0
 
     def test_suggest_organizations_api(self, api):
         """It should suggest organizations"""
@@ -658,13 +658,13 @@ class MembershipAPITest:
 
         response = api.get(url_for("api.suggest_organizations"), qs={"q": "xxxxxx", "size": "5"})
         assert200(response)
-        assert len(response.json) is 0
+        assert len(response.json) == 0
 
     def test_suggest_organizations_api_empty(self, api):
         """It should not provide organization suggestion if no data"""
         response = api.get(url_for("api.suggest_organizations"), qs={"q": "xxxxxx", "size": "5"})
         assert200(response)
-        assert len(response.json) is 0
+        assert len(response.json) == 0
 
     def test_suggest_organizations_homonyms(self, api):
         """It should suggest organizations and not deduplicate homonyms"""
@@ -673,7 +673,7 @@ class MembershipAPITest:
         response = api.get(url_for("api.suggest_organizations"), qs={"q": "homonym", "size": "5"})
         assert200(response)
 
-        assert len(response.json) is 2
+        assert len(response.json) == 2
 
         for suggestion in response.json:
             assert suggestion["name"] == "homonym"
@@ -749,7 +749,7 @@ class OrganizationDatasetsAPITest:
         response = api.get(url_for("api.org_datasets", org=org), qs={"page_size": 2})
 
         assert200(response)
-        assert len(response.json["data"]) is 2
+        assert len(response.json["data"]) == 2
 
 
 class OrganizationReusesAPITest:
@@ -841,7 +841,7 @@ class OrganizationBadgeAPITest:
             response = api.post(url, data)
             assert201(response)
         self.organization.reload()
-        assert len(self.organization.badges) is 1
+        assert len(self.organization.badges) == 1
 
     def test_create_same(self, api):
         data = self.factory.as_dict()
@@ -852,7 +852,7 @@ class OrganizationBadgeAPITest:
             response = api.post(url, data)
             assert200(response)
         self.organization.reload()
-        assert len(self.organization.badges) is 1
+        assert len(self.organization.badges) == 1
 
     def test_create_2nd(self, api):
         # Explicitely setting the kind to avoid collisions given the
@@ -865,7 +865,7 @@ class OrganizationBadgeAPITest:
         response = api.post(url, data)
         assert201(response)
         self.organization.reload()
-        assert len(self.organization.badges) is 2
+        assert len(self.organization.badges) == 2
 
     def test_delete(self, api):
         badge = self.factory()
@@ -876,7 +876,7 @@ class OrganizationBadgeAPITest:
             response = api.delete(url)
             assert204(response)
         self.organization.reload()
-        assert len(self.organization.badges) is 0
+        assert len(self.organization.badges) == 0
 
     def test_delete_404(self, api):
         kind = str(self.factory().kind)

udata/tests/api/test_reports_api.py

@@ -1,5 +1,4 @@
 from flask import url_for
-from mongoengine.base.datastructures import LazyReference
 
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.dataset.models import Dataset
@@ -9,8 +8,8 @@ from udata.core.reports.constants import (
     reports_reasons_translations,
 )
 from udata.core.reports.models import Report
-from udata.core.user.factories import UserFactory
-from udata.i18n import gettext as _
+from udata.core.reuse.factories import ReuseFactory
+from udata.core.user.factories import AdminFactory, UserFactory
 
 from . import APITestCase
 
@@ -100,6 +99,11 @@ class ReportsAPITest(APITestCase):
         reports[1].reload()
         self.assertIsNotNone(reports[1].subject_deleted_at)
 
+        # Should be logged as admin
+        response = self.get(url_for("api.reports"))
+        self.assert403(response)
+
+        self.login(AdminFactory())
         response = self.get(url_for("api.reports"))
         self.assert200(response)
 
@@ -119,3 +123,49 @@ class ReportsAPITest(APITestCase):
         self.assertEqual(REASON_SPAM, reports[1]["reason"])
         self.assertEqual(str(user.id), reports[1]["by"]["id"])
         self.assertIsNotNone(reports[1]["subject_deleted_at"])
+
+    def test_reports_api_list(self):
+        user = UserFactory()
+
+        spam_dataset = DatasetFactory.create(owner=user)
+        spam_reuse = ReuseFactory.create(owner=user)
+
+        Report(subject=spam_dataset, reason="spam").save()
+        Report(subject=spam_reuse, reason="spam").save()
+
+        # Should be logged as admin
+        response = self.get(url_for("api.reports"))
+        self.assert401(response)
+
+        self.login(AdminFactory())
+        response = self.get(url_for("api.reports"))
+        self.assert200(response)
+
+        payload = response.json
+        self.assertEqual(payload["total"], 2)
+        # Returned by order of creation by default
+        self.assertEqual(payload["data"][0]["subject"]["id"], str(spam_dataset.id))
+        self.assertEqual(
+            payload["data"][0]["self_api_url"],
+            url_for("api.report", report=payload["data"][0]["id"], _external=True),
+        )
+
+        self.assertEqual(payload["data"][1]["subject"]["id"], str(spam_reuse.id))
+
+    def test_reports_api_get(self):
+        user = UserFactory()
+
+        spam_dataset = DatasetFactory.create(owner=user)
+
+        report = Report(subject=spam_dataset, reason="spam").save()
+
+        # Should be logged as admin
+        response = self.get(url_for("api.report", report=report))
+        self.assert401(response)
+
+        self.login(AdminFactory())
+        response = self.get(url_for("api.report", report=report))
+        self.assert200(response)
+
+        payload = response.json
+        self.assertEqual(payload["subject"]["id"], str(spam_dataset.id))

udata/tests/api/test_tags_api.py

@@ -61,10 +61,10 @@ class TagsAPITest:
 
         response = api.get(url_for("api.suggest_tags"), qs={"q": "bbbb", "size": "5"})
         assert200(response)
-        assert len(response.json) is 0
+        assert len(response.json) == 0
 
     def test_suggest_tags_api_empty(self, api):
         """It should not provide tag suggestion if no data"""
         response = api.get(url_for("api.suggest_tags"), qs={"q": "bbbb", "size": "5"})
         assert200(response)
-        assert len(response.json) is 0
+        assert len(response.json) == 0

udata/tests/api/test_transfer_api.py

@@ -58,7 +58,7 @@ class TransferAPITest(APITestCase):
         self.assertEqual(data["status"], "pending")
 
     def test_400_on_bad_subject(self):
-        user = self.login()
+        self.login()
         recipient = UserFactory()
         comment = faker.sentence()
 

udata/tests/apiv2/test_datasets.py

@@ -83,7 +83,7 @@ class DatasetResourceAPIV2Test(APITestCase):
         assert data["total"] == len(resources)
         assert data["page"] == 1
         assert data["page_size"] == DEFAULT_PAGE_SIZE
-        assert data["next_page"] == None
+        assert data["next_page"] is None
         assert data["previous_page"] is None
 
     def test_get_missing_param(self):
@@ -97,7 +97,7 @@ class DatasetResourceAPIV2Test(APITestCase):
         assert data["total"] == len(resources)
         assert data["page"] == 1
         assert data["page_size"] == DEFAULT_PAGE_SIZE
-        assert data["next_page"] == None
+        assert data["next_page"] is None
         assert data["previous_page"] is None
 
     def test_get_next_page(self):
@@ -129,7 +129,7 @@ class DatasetResourceAPIV2Test(APITestCase):
         assert data["total"] == len(resources)
         assert data["page"] == 2
         assert data["page_size"] == DEFAULT_PAGE_SIZE
-        assert data["next_page"] == None
+        assert data["next_page"] is None
         assert data["previous_page"] == url_for(
             "apiv2.resources",
             dataset=dataset.id,
@@ -196,7 +196,7 @@ class DatasetResourceAPIV2Test(APITestCase):
         assert data["total"] == nb_resources__of_specific_type
         assert data["page"] == 2
         assert data["page_size"] == DEFAULT_PAGE_SIZE
-        assert data["next_page"] == None
+        assert data["next_page"] is None
         assert data["previous_page"] == url_for(
             "apiv2.resources",
             dataset=dataset.id,

udata/tests/dataset/test_dataset_model.py

@@ -301,15 +301,15 @@ class DatasetModelTest:
 
     def test_dataset_without_private(self):
         dataset = DatasetFactory()
-        assert dataset.private == False
+        assert dataset.private is False
 
         dataset.private = None
         dataset.save()
-        assert dataset.private == False
+        assert dataset.private is False
 
         dataset.private = True
         dataset.save()
-        assert dataset.private == True
+        assert dataset.private is True
 
 
 class ResourceModelTest:

udata/tests/frontend/__init__.py

@@ -1,8 +1,6 @@
 import json
 import re
 
-import pytest
-
 from udata.tests import DBTestMixin, TestCase, WebTestMixin
 
 

udata/tests/frontend/test_auth.py

@@ -11,7 +11,6 @@ class AuthTest(FrontTestCase):
 
     def test_change_mail(self):
         user = self.login(AdminFactory())
-        url = url_for("security.change_email")
 
         new_email = "test@test.com"
 

udata/tests/organization/test_csv_adapter.py

@@ -1,8 +1,6 @@
 import pytest
 
-from udata.core.dataset.csv import DatasetCsvAdapter, ResourcesCsvAdapter
 from udata.core.dataset.factories import DatasetFactory, ResourceFactory
-from udata.core.dataset.models import Dataset
 from udata.core.organization.csv import OrganizationCsvAdapter
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.organization.models import Organization

udata/tests/organization/test_notifications.py

@@ -17,11 +17,11 @@ class OrganizationNotificationsTest:
         members = [Member(user=editor, role="editor"), Member(user=admin, role="admin")]
         org = OrganizationFactory(members=members, requests=[request])
 
-        assert len(membership_request_notifications(applicant)) is 0
-        assert len(membership_request_notifications(editor)) is 0
+        assert len(membership_request_notifications(applicant)) == 0
+        assert len(membership_request_notifications(editor)) == 0
 
         notifications = membership_request_notifications(admin)
-        assert len(notifications) is 1
+        assert len(notifications) == 1
         dt, details = notifications[0]
         assert_equal_dates(dt, request.created)
         assert details["id"] == request.id

udata/tests/reuse/test_reuse_model.py

@@ -1,4 +1,3 @@
-import re
 from datetime import datetime
 
 from udata.core.dataset import tasks as dataset_tasks

udata/tests/site/test_site_rdf.py

@@ -254,9 +254,7 @@ class SiteRdfViewsTest:
         dataset_b = DatasetFactory.create()
         dataset_c = DatasetFactory.create()
 
-        dataservice_a = DataserviceFactory.create(
-            datasets=[dataset_a.id], harvest=HarvestMetadataFactory()
-        )
+        DataserviceFactory.create(datasets=[dataset_a.id], harvest=HarvestMetadataFactory())
         dataservice_b = DataserviceFactory.create(datasets=[dataset_b.id])
         dataservice_x = DataserviceFactory.create(datasets=[dataset_a.id, dataset_c.id])
         dataservice_y = DataserviceFactory.create(datasets=[])

udata/tests/test_cors.py

@@ -1,11 +1,8 @@
 from datetime import datetime
 
-import pytest
 from flask import url_for
 
 from udata.core.dataset.factories import DatasetFactory
-from udata.core.topic.factories import TopicFactory
-from udata.search import reindex
 from udata.tests.api import APITestCase
 from udata.tests.helpers import assert_status
 

udata/tests/test_owned.py

@@ -161,8 +161,8 @@ class OwnedQuerysetTest(DBTestMixin, TestCase):
         result = Owned.objects.owned_by(org, user)
 
         self.assertEqual(len(result), 2)
-        for owned in result:
-            self.assertIn(owned, owneds)
+        for owned_ in result:
+            self.assertIn(owned_, owneds)
 
-        for owned in excluded:
-            self.assertNotIn(owned, result)
+        for owned_ in excluded:
+            self.assertNotIn(owned_, result)

udata/tests/test_routing.py

@@ -273,7 +273,7 @@ class SlugAsSLugFieldWithFollowTest(AsSlugMixin):
         assert404(client.get(second_url))
         assert404(client.get(last_url))
 
-        assert SlugFollow.objects.count() is 0
+        assert SlugFollow.objects.count() == 0
 
 
 @pytest.mark.usefixtures("clean_db")