MAINT: rename printRessort to print_ressort

keep consistent naming for variables
ZeitOnline · Nov 15, 2024 · 1e4d2b9 · 1e4d2b9
1 parent 4cc7fcb
commit 1e4d2b9
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/core/src/zeit/cms/browser/listing.py b/core/src/zeit/cms/browser/listing.py
@@ -84,9 +84,9 @@ def ressort(self):
         return self.context.ressort
 
     @zope.cachedescriptors.property.Lazy
-    def printRessort(self):
-        if self.context.printRessort:
-            return self.context.printRessort
+    def print_ressort(self):
+        if self.context.print_ressort:
+            return self.context.print_ressort
         return self.context.ressort
 
     @zope.cachedescriptors.property.Lazy

diff --git a/core/src/zeit/cms/content/interfaces.py b/core/src/zeit/cms/content/interfaces.py
@@ -101,7 +101,7 @@ class ICommonMetadata(zope.interface.Interface):
     )
     zope.interface.alsoProvides(channels.value_type, IChannelField)
 
-    printRessort = zope.schema.TextLine(title=_('Print ressort'), required=False)
+    print_ressort = zope.schema.TextLine(title=_('Print ressort'), required=False)
 
     # not required since e.g. Agenturmeldungen don't have an author, only
     # a copyright notice

diff --git a/core/src/zeit/cms/content/metadata.py b/core/src/zeit/cms/content/metadata.py
@@ -78,8 +78,8 @@ class CommonMetadata(zeit.cms.content.xmlsupport.XMLContentBase):
         '.teaser.supertitle', ICommonMetadata['teaserSupertitle']
     )
 
-    printRessort = zeit.cms.content.dav.DAVProperty(
-        ICommonMetadata['printRessort'], zeit.cms.interfaces.PRINT_NAMESPACE, 'ressort'
+    print_ressort = zeit.cms.content.dav.DAVProperty(
+        ICommonMetadata['print_ressort'], zeit.cms.interfaces.PRINT_NAMESPACE, 'ressort'
     )
 
     commentsPremoderate = zeit.cms.content.dav.DAVProperty(

diff --git a/core/src/zeit/content/article/edit/browser/form.py b/core/src/zeit/content/article/edit/browser/form.py
@@ -281,7 +281,7 @@ class PrintFormGroup(zeit.edit.browser.form.FoldableFormGroup):
 class PrintMetadata(zeit.edit.browser.form.InlineForm):
     legend = _('')
     prefix = 'print-metadata'
-    form_fields = FormFields(ICommonMetadata).select('year', 'volume', 'page', 'printRessort')
+    form_fields = FormFields(ICommonMetadata).select('year', 'volume', 'page', 'print_ressort')
 
     def _success_handler(self):
         self.signal('reload-inline-view', 'edit.heading')

diff --git a/core/src/zeit/content/article/edit/browser/tests/test_metadata.py b/core/src/zeit/content/article/edit/browser/tests/test_metadata.py
@@ -34,15 +34,15 @@ def test_form_should_save_entered_text_on_blur(self):
         s.waitForElementNotPresent('css=.field.dirty')
         s.type('id=print-metadata.year', '2010')
         s.keyPress('id=print-metadata.volume', Keys.TAB)
-        s.type('id=print-metadata.printRessort', 'Politik')
-        s.keyPress('id=print-metadata.printRessort', Keys.TAB)  # Trigger blur
+        s.type('id=print-metadata.print_ressort', 'Politik')
+        s.keyPress('id=print-metadata.print_ressort', Keys.TAB)  # Trigger blur
         s.waitForElementNotPresent('css=.field.dirty')
         # Re-open the page and verify that the data is still there
         s.clickAndWait('link=Edit contents')
         s.waitForElementPresent('id=print-metadata.year')
         s.assertValue('id=print-metadata.year', '2010')
         s.waitForElementPresent('id=print-metadata.year')
-        s.assertValue('id=print-metadata.printRessort', 'Politik')
+        s.assertValue('id=print-metadata.print_ressort', 'Politik')
 
     def test_form_should_save_selection_on_blur(self):
         s = self.selenium
@@ -80,7 +80,7 @@ def test_invalid_input_should_display_error_message(self):
         s.assertValue('id=print-metadata.year', '2007')
         s.type('id=print-metadata.year', 'ASDF')
         s.keyPress('id=print-metadata.volume', Keys.TAB)
-        s.keyPress('id=print-metadata.printRessort', Keys.TAB)  # Trigger blur
+        s.keyPress('id=print-metadata.print_ressort', Keys.TAB)  # Trigger blur
         s.waitForElementPresent('css=.inline-form div.error')
 
     def test_relateds_should_be_addable(self):

diff --git a/core/src/zeit/content/cp/tests/test_automatic.py b/core/src/zeit/content/cp/tests/test_automatic.py
@@ -1261,14 +1261,14 @@ def test_print_queries(self):
         self.area.query = (
             ('year', 'eq', 2024),
             ('volume', 'eq', 10),
-            ('printRessort', 'eq', 'DIE ZEIT'),
+            ('print_ressort', 'eq', 'Politik'),
         )
         self.area.query_order = 'page'
         IRenderedArea(self.area).values()
         query = """
 ...properties.volume_year = '2024'
  AND properties.volume_number = '10'
- AND properties.print_ressort = 'DIE ZEIT'...
+ AND properties.print_ressort = 'Politik'...
  ORDER BY page asc...
 """
         self.assertEllipsis(query, self.connector.search_args[0])
diff --git a/core/src/zeit/content/volume/browser/tests/test_toc.py b/core/src/zeit/content/volume/browser/tests/test_toc.py
@@ -161,7 +161,7 @@ def setUp(self):
                 article.title = self.article_title
                 article.subtitle = 'required'
                 article.page = self.article_page
-                article.printRessort = 'ressort %s' % ressort
+                article.print_ressort = 'ressort %s' % ressort
                 self.repository['2015']['01']['test_artikel_%s' % ressort] = article
 
     def test_toc_view_is_csv_file_download(self):

diff --git a/core/src/zeit/content/volume/browser/toc.py b/core/src/zeit/content/volume/browser/toc.py
@@ -77,7 +77,7 @@ def _get_ir_content(self):
                     toc_entry['preview_url'] = zope.component.getMultiAdapter(
                         (article, 'preview'), IPreviewURL
                     )
-                    result_for_product[article.printRessort].append(toc_entry)
+                    result_for_product[article.print_ressort].append(toc_entry)
             results[product.title] = result_for_product
         return results
 

diff --git a/core/src/zeit/content/volume/browser/toc_listing.py b/core/src/zeit/content/volume/browser/toc_listing.py
@@ -36,7 +36,7 @@ class TocListing(zeit.cms.browser.listing.Listing):
         + zeit.cms.browser.listing.Listing.columns[4:6]
         + (
             zeit.cms.browser.listing.GetterColumn(
-                _('Ressort'), name='ressort', getter=lambda t, c: t.printRessort
+                _('Ressort'), name='ressort', getter=lambda t, c: t.print_ressort
             ),
         )
         + (

diff --git a/core/src/zeit/contentquery/interfaces.py b/core/src/zeit/contentquery/interfaces.py
@@ -68,7 +68,7 @@ class QueryTypeSource(zeit.cms.content.sources.SimpleDictSource):
         'content_type': _('query-type-content-type'),
         'year': _('query-type-year'),
         'volume': _('query-type-volume'),
-        'printRessort': _('query-type-printRessort'),
+        'print_ressort': _('query-type-print_ressort'),
     }
 
 
@@ -191,7 +191,7 @@ class IQueryConditions(zeit.content.article.interfaces.IArticle):
     content_type = zope.schema.Choice(
         title=_('Content type'), source=zeit.cms.content.sources.CMSContentTypeSource()
     )
-    printRessort = zope.schema.Choice(
+    print_ressort = zope.schema.Choice(
         title=_('Print Ressort'), source=zeit.cms.content.sources.PrintRessortSource()
     )