diff --git a/core/src/zeit/content/article/article.py b/core/src/zeit/content/article/article.py index 4886584d7d..4cfaf08a78 100644 --- a/core/src/zeit/content/article/article.py +++ b/core/src/zeit/content/article/article.py @@ -55,14 +55,6 @@ """ -class ToggleableAccess(zeit.cms.content.dav.DAVProperty): - def __get__(self, instance, class_, properties=None): - value = super().__get__(instance, class_, properties) - if FEATURE_TOGGLES.find('access_treat_free_as_dynamic') and value == 'free': - return 'dynamic' - return value - - @zope.interface.implementer( zeit.content.article.interfaces.IArticle, zeit.cms.interfaces.IEditorialContent ) @@ -97,7 +89,7 @@ class Article(zeit.cms.content.metadata.CommonMetadata): ), ) - access = ToggleableAccess( + access = zeit.cms.content.dav.DAVProperty( ICommonMetadata['access'], zeit.cms.interfaces.DOCUMENT_SCHEMA_NS, 'access', diff --git a/core/src/zeit/content/article/tests/test_article.py b/core/src/zeit/content/article/tests/test_article.py index 1cc222846e..e283674b80 100644 --- a/core/src/zeit/content/article/tests/test_article.py +++ b/core/src/zeit/content/article/tests/test_article.py @@ -392,17 +392,6 @@ def test_no_checksum_for_ignored_genres(self): assert not checksum.checksum -class ArticleAccess(zeit.content.article.testing.FunctionalTestCase): - def test_free_is_treated_as_dynamic_according_to_toggle(self): - article = self.repository['article'] = self.get_article() - with zeit.cms.checkout.helper.checked_out(article) as co: - co.access = 'free' - article = self.repository['article'] - self.assertEqual('free', article.access) - FEATURE_TOGGLES.set('access_treat_free_as_dynamic') - self.assertEqual('dynamic', article.access) - - class AudioArticle(zeit.content.article.testing.FunctionalTestCase): def _add_audio_to_article(self): self.repository['article'] = self.article