Merge pull request #464 from collective/maurits-use-newer-code

Use newer code, fix deprecations

Author: mauritsvanrees

CHANGES.rst

@@ -5,7 +5,8 @@ Changelog
 4.5.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Remove usage of the ``six`` compatibility library.  [maurits]
+- Update deprecated imports for Plone 6.0 and higher.  [maurits]
 
 
 4.5.0 (2026-01-12)

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # collective.easyform documentation build configuration file, created by
 # sphinx-quickstart on Mon Feb 24 23:51:08 2014.
@@ -51,8 +50,8 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"collective.easyform"
-copyright = u"2014, Roman Kozlovskyi"
+project = "collective.easyform"
+copyright = "2014, Roman Kozlovskyi"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -195,8 +194,8 @@
     (
         "index",
         "collectiveeasyform.tex",
-        u"collective.easyform Documentation",
-        u"Roman Kozlovskyi",
+        "collective.easyform Documentation",
+        "Roman Kozlovskyi",
         "manual",
     ),
 ]
@@ -230,8 +229,8 @@
     (
         "index",
         "collectiveeasyform",
-        u"collective.easyform Documentation",
-        [u"Roman Kozlovskyi"],
+        "collective.easyform Documentation",
+        ["Roman Kozlovskyi"],
         1,
     )
 ]
@@ -249,8 +248,8 @@
     (
         "index",
         "collectiveeasyform",
-        u"collective.easyform Documentation",
-        u"Roman Kozlovskyi",
+        "collective.easyform Documentation",
+        "Roman Kozlovskyi",
         "collectiveeasyform",
         "One line description of project.",
         "Miscellaneous",

setup.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from setuptools import find_packages
 from setuptools import setup
 
@@ -54,7 +53,6 @@
         "Products.CMFPlone>=6.0.0b1",
         "Products.validation>=3.0.0",
         "setuptools",
-        "six",
         # -*- Extra requirements: -*-
     ],
     extras_require={

src/collective/__init__.py

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

src/collective/easyform/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from zope.i18nmessageid import MessageFactory