Merge branch 'plone.base-overhaul'

plone · May 15, 2022 · 4b634da · 4b634da
2 parents 8685e70 + d275b41
commit 4b634da
Show file tree

Hide file tree

Showing 47 changed files with 2,224 additions and 2,332 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,18 +1,20 @@
 # sphinx configuration
 
-project = u'plone.app.event'
-copyright = u'2012, Plone Foundation'
+project = "plone.app.event"
+copyright = "2012, Plone Foundation"
 
 extensions = [
-    'sphinx.ext.doctest',
-    'sphinx.ext.coverage',
-    'sphinx.ext.autodoc',
-    'sphinx.ext.viewcode',
-    'sphinx.ext.autosummary',
+    "sphinx.ext.doctest",
+    "sphinx.ext.coverage",
+    "sphinx.ext.autodoc",
+    "sphinx.ext.viewcode",
+    "sphinx.ext.autosummary",
 ]
-master_doc = 'index'
+master_doc = "index"
 
-language = 'en'
+language = "en"
 
 from pkg_resources import get_distribution
+
+
 version = release = get_distribution(project).version
diff --git a/news/356.breaking b/news/356.breaking
@@ -0,0 +1,2 @@
+Code Style, pyupgrade, remove six, use plone.base, some overhaul.
+[jensens] 
diff --git a/plone/__init__.py b/plone/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
-__import__('pkg_resources').declare_namespace(__name__)
+__import__("pkg_resources").declare_namespace(__name__)
diff --git a/plone/app/__init__.py b/plone/app/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
-__import__('pkg_resources').declare_namespace(__name__)
+__import__("pkg_resources").declare_namespace(__name__)
diff --git a/plone/app/event/__init__.py b/plone/app/event/__init__.py
@@ -1,14 +1,18 @@
-# -*- coding: utf-8 -*-
 from AccessControl.Permission import addPermission
 from zope.i18nmessageid import MessageFactory
 
+
 packageName = __name__
-_ = MessageFactory('plone')
+_ = MessageFactory("plone")
 
 # BBB Permissions
-PORTAL_ADD_PERMISSION = 'Add portal events'  # CMFCalendar/ATCT permissions
+PORTAL_ADD_PERMISSION = "Add portal events"  # CMFCalendar/ATCT permissions
 
 addPermission(
     PORTAL_ADD_PERMISSION,
-    ('Manager', 'Site Administrator', 'Owner',)
+    (
+        "Manager",
+        "Site Administrator",
+        "Owner",
+    ),
 )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Code Style, pyupgrade, remove six, use plone.base, some overhaul.
		[jensens]