Merge pull request #7 from plone/config-with-default-template-fe7626df

Config with default template

.editorconfig

@@ -0,0 +1,39 @@
+# Generated from:
+# https://github.com/plone/meta/tree/master/config/default
+#
+# EditorConfig Configuration file, for more details see:
+# http://EditorConfig.org
+# EditorConfig is a convention description, that could be interpreted
+# by multiple editors to enforce common coding conventions for specific
+# file types
+
+# top-most EditorConfig file:
+# Will ignore other EditorConfig files in Home directory or upper tree level.
+root = true
+
+
+[*]  # For All Files
+# Unix-style newlines with a newline ending every file
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+# Set default charset
+charset = utf-8
+# Indent style default
+indent_style = space
+# Max Line Length - a hard line wrap, should be disabled
+max_line_length = off
+
+[*.{py,cfg,ini}]
+# 4 space indentation
+indent_size = 4
+
+[*.{yml,zpt,pt,dtml,zcml}]
+# 2 space indentation
+indent_size = 2
+
+[{Makefile,.gitmodules}]
+# Tab indentation (no size specified, but view as 4 spaces)
+indent_style = tab
+indent_size = unset
+tab_width = unset

.meta.toml

@@ -0,0 +1,5 @@
+# Generated from:
+# https://github.com/plone/meta/tree/master/config/default
+[meta]
+template = "default"
+commit-id = "2ed8f544"

.pre-commit-config.yaml

@@ -0,0 +1,42 @@
+# Generated from:
+# https://github.com/plone/meta/tree/master/config/default
+ci:
+    autofix_prs: false
+    autoupdate_schedule: monthly
+
+repos:
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v3.3.1
+    hooks:
+    -   id: pyupgrade
+        args: [--py38-plus]
+-   repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+    -   id: isort
+-   repo: https://github.com/psf/black
+    rev: 23.3.0
+    hooks:
+    -   id: black
+-   repo: https://github.com/collective/zpretty
+    rev: 3.0.3
+    hooks:
+    -   id: zpretty
+-   repo: https://github.com/PyCQA/flake8
+    rev: 6.0.0
+    hooks:
+    -   id: flake8
+-   repo: https://github.com/codespell-project/codespell
+    rev: v2.2.4
+    hooks:
+    -   id: codespell
+        additional_dependencies:
+          - tomli
+-   repo: https://github.com/mgedmin/check-manifest
+    rev: "0.49"
+    hooks:
+    -   id: check-manifest
+-   repo: https://github.com/regebro/pyroma
+    rev: "4.2"
+    hooks:
+    -   id: pyroma

news/1.breaking

@@ -0,0 +1,2 @@
+Drop python 2.7 support.
+[gforcada]

news/2ed8f544.internal

@@ -0,0 +1,2 @@
+Update configuration files.
+[plone devs]

plone/__init__.py

@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
-__import__('pkg_resources').declare_namespace(__name__)
+__import__("pkg_resources").declare_namespace(__name__)

plone/uuid/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

plone/uuid/adapter.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from plone.uuid import interfaces
 from zope import component
 from zope import interface
@@ -12,8 +11,7 @@ def attributeUUID(context):
 
 @interface.implementer(interfaces.IMutableUUID)
 @component.adapter(interfaces.IAttributeUUID)
-class MutableAttributeUUID(object):
-
+class MutableAttributeUUID:
     def __init__(self, context):
         self.context = context
 

plone/uuid/browser.py

@@ -1,19 +1,9 @@
-# -*- coding: utf-8 -*-
 from plone.uuid.interfaces import IUUID
 from zope.publisher.browser import BrowserView
 
-import sys
-
-
-if sys.version_info >= (3,):
-    text_type = str
-else:
-    text_type = unicode
-
 
 class UUIDView(BrowserView):
-    """A simple browser view that renders the UUID of its context
-    """
+    """A simple browser view that renders the UUID of its context"""
 
     def __call__(self):
-        return text_type(IUUID(self.context, u""))
+        return str(IUUID(self.context, ""))

plone/uuid/configure.zcml

@@ -1,16 +1,21 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
-    xmlns:zcml="http://namespaces.zope.org/zcml"
     xmlns:i18n="http://namespaces.zope.org/i18n"
-    i18n_domain="plone.uuid">
+    xmlns:zcml="http://namespaces.zope.org/zcml"
+    i18n_domain="plone.uuid"
+    >
 
-  <include package="zope.component" file="meta.zcml" />
+  <include
+      package="zope.component"
+      file="meta.zcml"
+      />
   <include package="zope.component" />
 
-  <!-- Make sure we test the Zope 2 version of view registrations in Zope 2 -->
-  <include zcml:condition="installed Products.Five" package="Products.Five.browser" file="meta.zcml" />
-  <include zcml:condition="not-installed Products.Five" package="zope.browserpage" file="meta.zcml" />
+  <include
+      package="zope.browserpage"
+      file="meta.zcml"
+      />
 
   <adapter factory=".adapter.attributeUUID" />
   <adapter factory=".adapter.MutableAttributeUUID" />
@@ -19,8 +24,8 @@
 
   <browser:view
       name="uuid"
-      class=".browser.UUIDView"
       for=".interfaces.IUUIDAware"
+      class=".browser.UUIDView"
       permission="zope.Public"
       />
 

plone/uuid/generator.py

@@ -1,26 +1,15 @@
-# -*- coding: utf-8 -*-
 from plone.uuid.interfaces import IUUIDGenerator
-from zope.deprecation import deprecate
 from zope.interface import implementer
 
 import uuid
 
 
 @implementer(IUUIDGenerator)
-class UUID4Generator(object):
+class UUID4Generator:
     """Default UUID implementation.
 
     Uses uuid.uuid4()
     """
 
     def __call__(self):
         return uuid.uuid4().hex
-
-
-@deprecate(
-    'UUID1Generator was renamed to UUID4Generator, as we use uuid4 instead of '
-    'uuid1. Please use UUID4Generator instead.'
-)
-class UUID1Generator(UUID4Generator):
-    """BBB. Remove with next major version.
-    """

plone/uuid/handlers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from plone.uuid.interfaces import ATTRIBUTE_NAME
 from plone.uuid.interfaces import IAttributeUUID
 from plone.uuid.interfaces import IUUIDGenerator
@@ -11,12 +10,14 @@
 try:
     from Acquisition import aq_base
 except ImportError:
-    aq_base = lambda v: v  # soft-dependency on Zope2, fallback
+
+    def aq_base(obj):
+        # soft-dependency on Zope2, fallback
+        return obj
 
 
 @adapter(IAttributeUUID, IObjectCreatedEvent)
 def addAttributeUUID(obj, event):
-
     if not IObjectCopiedEvent.providedBy(event):
         if getattr(aq_base(obj), ATTRIBUTE_NAME, None):
             return  # defensive: keep existing UUID on non-copy create

plone/uuid/interfaces.py

@@ -1,17 +1,14 @@
-# -*- coding: utf-8 -*-
 from zope.interface import Interface
 
 
-ATTRIBUTE_NAME = '_plone.uuid'
+ATTRIBUTE_NAME = "_plone.uuid"
 
 
 class IUUIDGenerator(Interface):
-    """Utility for generating UUIDs
-    """
+    """Utility for generating UUIDs"""
 
     def __call__():
-        """Generate a new UUID.
-        """
+        """Generate a new UUID."""
 
 
 class IUUIDAware(Interface):
@@ -43,9 +40,9 @@ class IMutableUUID(Interface):
     Be sure of what you are doing. UUID is supposed to be stable and
     widely used
     """
+
     def get():
         """Return the UUID of the context"""
 
     def set(uuid):
-        """Set the unique id of the context with the uuid value.
-        """
+        """Set the unique id of the context with the uuid value."""