From 2645c89eb00db7c58492ceb55b8244e497f26fd7 Mon Sep 17 00:00:00 2001 From: Martin Stolle Date: Tue, 20 Feb 2024 10:12:31 +0100 Subject: [PATCH] ZO-4651: remove podcast block and header (everything podigee related) --- core/src/zeit/cms/content/sources.py | 6 --- .../article/edit/browser/configure.zcml | 25 ------------- .../zeit/content/article/edit/browser/edit.py | 11 ------ .../edit/browser/tests/test_podcast.py | 14 ------- .../zeit/content/article/edit/configure.zcml | 11 ------ .../zeit/content/article/edit/interfaces.py | 4 -- core/src/zeit/content/article/edit/podcast.py | 20 ---------- core/src/zeit/content/audio/interfaces.py | 5 --- .../zeit/content/audio/tests/test_audio.py | 1 - .../src/zeit/content/cp/blocks/configure.zcml | 9 ----- core/src/zeit/content/cp/blocks/podcast.py | 23 ------------ .../content/cp/browser/blocks/configure.zcml | 1 - .../browser/blocks/layout.podcast.content.pt | 4 -- .../zeit/content/cp/browser/blocks/podcast.py | 10 ----- .../content/cp/browser/blocks/podcast.zcml | 26 ------------- .../cp/browser/blocks/tests/test_podcast.py | 37 ------------------- core/src/zeit/content/cp/interfaces.py | 6 --- .../zeit/content/cp/tests/fixtures/blocks.xml | 1 - core/src/zeit/content/modules/interfaces.py | 20 ---------- core/src/zeit/content/modules/testing.py | 1 - 20 files changed, 235 deletions(-) delete mode 100644 core/src/zeit/content/article/edit/browser/tests/test_podcast.py delete mode 100644 core/src/zeit/content/article/edit/podcast.py delete mode 100644 core/src/zeit/content/cp/blocks/podcast.py delete mode 100644 core/src/zeit/content/cp/browser/blocks/layout.podcast.content.pt delete mode 100644 core/src/zeit/content/cp/browser/blocks/podcast.py delete mode 100644 core/src/zeit/content/cp/browser/blocks/podcast.zcml delete mode 100644 core/src/zeit/content/cp/browser/blocks/tests/test_podcast.py diff --git a/core/src/zeit/cms/content/sources.py b/core/src/zeit/cms/content/sources.py index 806c7081ef..c3fbacf229 100644 --- a/core/src/zeit/cms/content/sources.py +++ b/core/src/zeit/cms/content/sources.py @@ -500,8 +500,6 @@ def __init__( kind=None, video=False, fallback_image=False, - podigee_id=None, - podigee_url=None, zonaudioapp_id=None, color=None, available=None, @@ -516,8 +514,6 @@ def __init__( self.kind = kind self.video = video self.fallback_image = fallback_image - self.podigee_url = podigee_url - self.podigee_id = podigee_id self.zonaudioapp_id = zonaudioapp_id self.color = color @@ -549,8 +545,6 @@ def _values(self): unicode_or_none(node.get('kind')), node.get('video') == 'yes', node.get('fallback_image') == 'yes', - unicode_or_none(node.get('podigee-id')), - unicode_or_none(node.get('podigee-url')), unicode_or_none(node.get('zonaudioapp-id')), unicode_or_none(node.get('color')), unicode_or_none(node.get('available')), diff --git a/core/src/zeit/content/article/edit/browser/configure.zcml b/core/src/zeit/content/article/edit/browser/configure.zcml index a566989cb0..3f094cd6d0 100644 --- a/core/src/zeit/content/article/edit/browser/configure.zcml +++ b/core/src/zeit/content/article/edit/browser/configure.zcml @@ -585,27 +585,6 @@ weight="10" /> - - - - - - - - - - diff --git a/core/src/zeit/content/article/edit/browser/edit.py b/core/src/zeit/content/article/edit/browser/edit.py index 55916e5e47..fd6dc37538 100644 --- a/core/src/zeit/content/article/edit/browser/edit.py +++ b/core/src/zeit/content/article/edit/browser/edit.py @@ -398,17 +398,6 @@ def prefix(self): return 'quiz.{0}'.format(self.context.__name__) -class EditPodcast(zeit.edit.browser.form.InlineForm): - legend = None - form_fields = zope.formlib.form.FormFields(zeit.content.article.edit.interfaces.IPodcast).omit( - *list(zeit.edit.interfaces.IBlock) - ) - - @property - def prefix(self): - return 'podcast.{0}'.format(self.context.__name__) - - class EditBox(zeit.edit.browser.form.InlineForm): legend = None _form_fields = zope.formlib.form.FormFields( diff --git a/core/src/zeit/content/article/edit/browser/tests/test_podcast.py b/core/src/zeit/content/article/edit/browser/tests/test_podcast.py deleted file mode 100644 index 7bc4a31c53..0000000000 --- a/core/src/zeit/content/article/edit/browser/tests/test_podcast.py +++ /dev/null @@ -1,14 +0,0 @@ -import zeit.content.article.edit.browser.testing - - -class Form(zeit.content.article.edit.browser.testing.BrowserTestCase): - def test_inline_form_saves_values(self): - self.get_article(with_block='podcast') - b = self.browser - b.open('editable-body/blockname/@@edit-podcast?show_form=1') - b.getControl('Podcast id').value = 'bloggy' - b.getControl('Provider').displayValue = ['Tempus Corporate'] - b.getControl('Apply').click() - b.reload() - self.assertEqual('bloggy', b.getControl('Podcast id').value) - self.assertEqual(['Tempus Corporate'], b.getControl('Provider').displayValue) diff --git a/core/src/zeit/content/article/edit/configure.zcml b/core/src/zeit/content/article/edit/configure.zcml index 05ecadf4ab..53afc662a7 100644 --- a/core/src/zeit/content/article/edit/configure.zcml +++ b/core/src/zeit/content/article/edit/configure.zcml @@ -327,17 +327,6 @@ /> - - - - - - - - - - - diff --git a/core/src/zeit/content/cp/browser/blocks/layout.podcast.content.pt b/core/src/zeit/content/cp/browser/blocks/layout.podcast.content.pt deleted file mode 100644 index f3524de8b4..0000000000 --- a/core/src/zeit/content/cp/browser/blocks/layout.podcast.content.pt +++ /dev/null @@ -1,4 +0,0 @@ -
- ID: Id -
diff --git a/core/src/zeit/content/cp/browser/blocks/podcast.py b/core/src/zeit/content/cp/browser/blocks/podcast.py deleted file mode 100644 index ab6ff8108f..0000000000 --- a/core/src/zeit/content/cp/browser/blocks/podcast.py +++ /dev/null @@ -1,10 +0,0 @@ -import zope.formlib.form - -import zeit.content.cp.browser.blocks.block -import zeit.content.cp.interfaces - - -class EditProperties(zeit.content.cp.browser.blocks.block.EditCommon): - form_fields = zope.formlib.form.Fields(zeit.content.cp.interfaces.IPodcastBlock).omit( - *list(zeit.content.cp.interfaces.IBlock) - ) diff --git a/core/src/zeit/content/cp/browser/blocks/podcast.zcml b/core/src/zeit/content/cp/browser/blocks/podcast.zcml deleted file mode 100644 index 513e54dabb..0000000000 --- a/core/src/zeit/content/cp/browser/blocks/podcast.zcml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - diff --git a/core/src/zeit/content/cp/browser/blocks/tests/test_podcast.py b/core/src/zeit/content/cp/browser/blocks/tests/test_podcast.py deleted file mode 100644 index 831bf9d7ce..0000000000 --- a/core/src/zeit/content/cp/browser/blocks/tests/test_podcast.py +++ /dev/null @@ -1,37 +0,0 @@ -import zeit.content.cp -import zeit.content.cp.centerpage -import zeit.content.cp.testing - - -class TestPodcast(zeit.content.cp.testing.BrowserTestCase): - def setUp(self): - super().setUp() - self.centerpage = zeit.content.cp.centerpage.CenterPage() - self.centerpage.body['lead'].create_item('podcast') - self.repository['centerpage'] = self.centerpage - b = self.browser - b.open('http://localhost/++skin++vivi/repository/centerpage/@@checkout') - b.open('contents') - self.content_url = b.url - - def test_can_create_podcast_module_via_drag_n_drop_from_sidebar(self): - b = self.browser - self.assertEqual(1, b.contents.count('type-podcast')) - b.open('body/informatives/@@landing-zone-drop-module?block_type=podcast') - b.open(self.content_url) - self.assertEqual(2, b.contents.count('type-podcast')) - - def test_podcast_id_is_editable(self): - b = self.browser - b.getLink('Edit block properties', index=0).click() - b.getControl('Podcast id').value = '12345' - zeit.content.cp.centerpage._test_helper_cp_changed = False - b.getControl('Apply').click() - self.assertTrue(zeit.content.cp.centerpage._test_helper_cp_changed) - self.assertEllipsis('...Updated on...', b.contents) - - b.open(self.content_url) - self.assertEllipsis('...ID:...12345...', b.contents) - b.getLink('Edit block properties', index=0).click() - self.assertEqual('12345', b.getControl('Podcast id').value.strip()) - self.assertEqual(['ZEIT ONLINE'], b.getControl('Provider').displayValue) diff --git a/core/src/zeit/content/cp/interfaces.py b/core/src/zeit/content/cp/interfaces.py index a234b20332..2806975fe6 100644 --- a/core/src/zeit/content/cp/interfaces.py +++ b/core/src/zeit/content/cp/interfaces.py @@ -734,12 +734,6 @@ class IJobTickerBlock(zeit.content.modules.interfaces.IJobTicker, IBlock): feed = zope.schema.Choice(title=_('Jobbox Ticker'), required=True, source=JOBTICKER_SOURCE) -class IPodcastBlock(IBlock, zeit.content.modules.interfaces.PodcastBase): - """The Podcast block with a reference to a podcast.""" - - pass - - class IMailBlock(zeit.content.modules.interfaces.IMail, IBlock): pass diff --git a/core/src/zeit/content/cp/tests/fixtures/blocks.xml b/core/src/zeit/content/cp/tests/fixtures/blocks.xml index 3548b958fd..ba7eacd9cb 100644 --- a/core/src/zeit/content/cp/tests/fixtures/blocks.xml +++ b/core/src/zeit/content/cp/tests/fixtures/blocks.xml @@ -4,7 +4,6 @@ - diff --git a/core/src/zeit/content/modules/interfaces.py b/core/src/zeit/content/modules/interfaces.py index f95e525841..d9e795a661 100644 --- a/core/src/zeit/content/modules/interfaces.py +++ b/core/src/zeit/content/modules/interfaces.py @@ -283,23 +283,3 @@ class ITickarooLiveblog(zeit.edit.interfaces.IBlock): default='chapter', required=True, ) - - -class PodigeeProvidersSource(zeit.cms.content.sources.SearchableXMLSource): - """A source for podigee providers config. API keys must be configured - in friedbert-deployment.""" - - attribute = 'id' - config_url = 'podigee-providers-source' - default_filename = 'podigee-providers.xml' - product_configuration = 'zeit.content.modules' - - -PODIGEE_PROVIDERS_SOURCE = PodigeeProvidersSource - - -class PodcastBase(zope.interface.Interface): - episode_id = zope.schema.TextLine(title=_('Podcast id')) - provider = zope.schema.Choice( - title=_('Provider'), source=PODIGEE_PROVIDERS_SOURCE('*//provider'), default='default' - ) diff --git a/core/src/zeit/content/modules/testing.py b/core/src/zeit/content/modules/testing.py index c9dd10de9d..b14e067676 100644 --- a/core/src/zeit/content/modules/testing.py +++ b/core/src/zeit/content/modules/testing.py @@ -17,7 +17,6 @@ embed-provider-source file://{here}/tests/fixtures/embed-providers.xml newsletter-source file://{here}/tests/fixtures/newsletter.xml recipe-metadata-source file://{here}/tests/fixtures/recipe-metadata.xml - podigee-providers-source file://{here}/tests/fixtures/podigee-providers.xml """.format(here=importlib.resources.files(__package__))