PyEnum: Update docs and rename the option

The new Enum implementation can no longer be switched off.
Individual features can still be deselected with the
environment variable PYSIDE6_OPTION_PYTHON_ENUM which
had the name PYSIDE63_OPTION_PYTHON_ENUM before.

This change is meant for PySide 6.6 .

Task-number: PYSIDE-1735
Change-Id: Iae5b7a9d42a0d7b005dbba20201a80713ef79be9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

6 files changed, 17 insertions, 17 deletions

diff --git a/sources/shiboken6/tests/samplebinding/derived_test.py b/sources/shiboken6/tests/samplebinding/derived_test.py
index 7db8e5155..62a8d6337 100644
--- a/sources/shiboken6/tests/samplebinding/derived_test.py
+++ b/sources/shiboken6/tests/samplebinding/derived_test.py
@@ -40,7 +40,7 @@ class DerivedTest(unittest.TestCase):
                                  'id_', 'pureVirtual', 'unpureVirtual'])
         self.assertTrue(inherited_methods.issubset(dir(Derived)))
 
-    @unittest.skipIf(sys.pyside63_option_python_enum, "Makes no sense with strict Enums")
+    @unittest.skipIf(sys.pyside6_option_python_enum, "Makes no sense with strict Enums")
     def testOverloadedMethodCall(self):
         '''Test if the correct overloaded method is being called.'''
         derived = Derived()
@@ -74,7 +74,7 @@ class DerivedTest(unittest.TestCase):
         derived = Derived()
         result = derived.overloaded(1.1, 2.2)
         self.assertEqual(type(result), OverloadedFuncEnum)
-        if not sys.pyside63_option_python_enum:
+        if not sys.pyside6_option_python_enum:
             self.assertEqual(result, sample.OverloadedFunc_ii)
 
     def testOverloadedMethodCallWithWrongNumberOfArguments(self):
diff --git a/sources/shiboken6/tests/samplebinding/enum_test.py b/sources/shiboken6/tests/samplebinding/enum_test.py
index 90f36a186..48748aba3 100644
--- a/sources/shiboken6/tests/samplebinding/enum_test.py
+++ b/sources/shiboken6/tests/samplebinding/enum_test.py
@@ -29,7 +29,7 @@ def createTempFile():
 class EnumTest(unittest.TestCase):
     '''Test case for Python representation of C++ enums.'''
 
-    @unittest.skipIf(sys.pyside63_option_python_enum, "test not suitable for Python enum")
+    @unittest.skipIf(sys.pyside6_option_python_enum, "test not suitable for Python enum")
     def testEnumRepr(self):
         enum = SampleNamespace.Option(1)
         self.assertEqual(eval(repr(enum)), enum)
@@ -43,7 +43,7 @@ class EnumTest(unittest.TestCase):
 
     def testEnumValuesInsideEnum(self):
         '''Enum values should be accessible inside the enum as well as outside.'''
-        for value_name in (SampleNamespace.Option.__members__ if sys.pyside63_option_python_enum
+        for value_name in (SampleNamespace.Option.__members__ if sys.pyside6_option_python_enum
                       else SampleNamespace.Option.values):
             enum_item1 = getattr(SampleNamespace.Option, value_name)
             enum_item2 = getattr(SampleNamespace, value_name)
@@ -107,7 +107,7 @@ class EnumTest(unittest.TestCase):
         event.setEventTypeByConstPtr(Event.BASIC_EVENT)
         self.assertEqual(event.eventType(), Event.BASIC_EVENT)
 
-    @unittest.skipIf(sys.pyside63_option_python_enum, "test not suitable for Python enum")
+    @unittest.skipIf(sys.pyside6_option_python_enum, "test not suitable for Python enum")
     def testEnumTpPrintImplementation(self):
         '''Without SbkEnum.tp_print 'print' returns the enum represented as an int.'''
         tmpfile = createTempFile()
@@ -123,7 +123,7 @@ class EnumTest(unittest.TestCase):
         self.assertEqual(SampleNamespace.enumArgumentWithDefaultValue(), SampleNamespace.UnixTime)
         self.assertEqual(SampleNamespace.enumArgumentWithDefaultValue(SampleNamespace.RandomNumber), SampleNamespace.RandomNumber)
 
-    @unittest.skipIf(sys.pyside63_option_python_enum, "test not suitable for Python enum")
+    @unittest.skipIf(sys.pyside6_option_python_enum, "test not suitable for Python enum")
     def testSignature(self):
         enum = SampleNamespace.Option(1)
         types = type(enum).mro()
@@ -141,16 +141,16 @@ class EnumTest(unittest.TestCase):
 
 class MyEvent(Event):
     def __init__(self):
-        Event.__init__(self, Event.EventType(3 if sys.pyside63_option_python_enum else 999))
+        Event.__init__(self, Event.EventType(3 if sys.pyside6_option_python_enum else 999))
 
 
 class OutOfBoundsTest(unittest.TestCase):
     def testValue(self):
         e = MyEvent()
         self.assertEqual(repr(e.eventType()), "<EventType.ANY_EVENT: 3>"
-            if sys.pyside63_option_python_enum else 'sample.Event.EventType(999)')
+            if sys.pyside6_option_python_enum else 'sample.Event.EventType(999)')
 
-    @unittest.skipIf(sys.pyside63_option_python_enum, "test not suitable for Python enum")
+    @unittest.skipIf(sys.pyside6_option_python_enum, "test not suitable for Python enum")
     def testNoneName(self):
         e = MyEvent()
         t = e.eventType()
diff --git a/sources/shiboken6/tests/samplebinding/enumfromremovednamespace_test.py b/sources/shiboken6/tests/samplebinding/enumfromremovednamespace_test.py
index 1551703a7..b7c21bbae 100644
--- a/sources/shiboken6/tests/samplebinding/enumfromremovednamespace_test.py
+++ b/sources/shiboken6/tests/samplebinding/enumfromremovednamespace_test.py
@@ -21,7 +21,7 @@ from shibokensupport.signature import get_signature
 
 class TestEnumFromRemovedNamespace(unittest.TestCase):
 
-    @unittest.skipIf(sys.pyside63_option_python_enum, "Makes no sense with strict Enums")
+    @unittest.skipIf(sys.pyside6_option_python_enum, "Makes no sense with strict Enums")
     def testEnumPromotedToGlobal(self):
         sample.RemovedNamespace1_Enum
         self.assertEqual(sample.RemovedNamespace1_Enum_Value0, 0)
diff --git a/sources/shiboken6/tests/samplebinding/modifications_test.py b/sources/shiboken6/tests/samplebinding/modifications_test.py
index d1e70004f..8c1441c2d 100644
--- a/sources/shiboken6/tests/samplebinding/modifications_test.py
+++ b/sources/shiboken6/tests/samplebinding/modifications_test.py
@@ -41,7 +41,7 @@ class ModificationsTest(unittest.TestCase):
         # PYSIDE-535: Need to collect garbage in PyPy to trigger deletion
         gc.collect()
 
-    @unittest.skipIf(sys.pyside63_option_python_enum, "Makes no sense with strict Enums")
+    @unittest.skipIf(sys.pyside6_option_python_enum, "Makes no sense with strict Enums")
     def testClassMembersAvailability(self):
         '''Test if Modified class really have the expected members.'''
         expected_members = set(['OverloadedModFunc', 'OverloadedNone',
diff --git a/sources/shiboken6/tests/samplebinding/namespace_test.py b/sources/shiboken6/tests/samplebinding/namespace_test.py
index 2087ced4b..90e9c451d 100644
--- a/sources/shiboken6/tests/samplebinding/namespace_test.py
+++ b/sources/shiboken6/tests/samplebinding/namespace_test.py
@@ -46,15 +46,15 @@ class TestClassesUnderNamespace(unittest.TestCase):
         self.assertEqual(str(SampleNamespace.SomeClass),
             "<class 'sample.SampleNamespace.SomeClass'>")
         self.assertEqual(str(SampleNamespace.SomeClass.ProtectedEnum),
-            "<enum 'ProtectedEnum'>" if sys.pyside63_option_python_enum else
+            "<enum 'ProtectedEnum'>" if sys.pyside6_option_python_enum else
             "<class 'sample.SampleNamespace.SomeClass.ProtectedEnum'>")
         self.assertEqual(str(SampleNamespace.SomeClass.SomeInnerClass.ProtectedEnum),
-            "<enum 'ProtectedEnum'>" if sys.pyside63_option_python_enum else
+            "<enum 'ProtectedEnum'>" if sys.pyside6_option_python_enum else
             "<class 'sample.SampleNamespace.SomeClass.SomeInnerClass.ProtectedEnum'>")
         self.assertEqual(str(SampleNamespace.SomeClass.SomeInnerClass.OkThisIsRecursiveEnough),
             "<class 'sample.SampleNamespace.SomeClass.SomeInnerClass.OkThisIsRecursiveEnough'>")
         self.assertEqual(str(SampleNamespace.SomeClass.SomeInnerClass.OkThisIsRecursiveEnough.NiceEnum),
-            "<enum 'NiceEnum'>" if sys.pyside63_option_python_enum else
+            "<enum 'NiceEnum'>" if sys.pyside6_option_python_enum else
             "<class 'sample.SampleNamespace.SomeClass.SomeInnerClass.OkThisIsRecursiveEnough.NiceEnum'>")
 
         # Test if enum inside of class is correct represented
diff --git a/sources/shiboken6/tests/samplebinding/sample_test.py b/sources/shiboken6/tests/samplebinding/sample_test.py
index 52abc968f..45c47a4c9 100644
--- a/sources/shiboken6/tests/samplebinding/sample_test.py
+++ b/sources/shiboken6/tests/samplebinding/sample_test.py
@@ -18,7 +18,7 @@ import sample
 class ModuleTest(unittest.TestCase):
     '''Test case for module and global functions'''
 
-    @unittest.skipIf(sys.pyside63_option_python_enum, "Makes no sense with strict Enums")
+    @unittest.skipIf(sys.pyside6_option_python_enum, "Makes no sense with strict Enums")
     def testModuleMembers(self):
         '''Test availability of classes, global functions and other members on binding'''
         expected_members = set(['Abstract', 'Derived', 'Point',
@@ -31,14 +31,14 @@ class ModuleTest(unittest.TestCase):
                                 'GlobalEnum', 'NoThing'])
         self.assertTrue(expected_members.issubset(dir(sample)))
 
-    @unittest.skipIf(sys.pyside63_option_python_enum, "Makes no sense with strict Enums")
+    @unittest.skipIf(sys.pyside6_option_python_enum, "Makes no sense with strict Enums")
     def testAbstractPrintFormatEnum(self):
         '''Test availability of PrintFormat enum from Abstract class'''
         enum_members = set(['PrintFormat', 'Short', 'Verbose',
                             'OnlyId', 'ClassNameAndId'])
         self.assertTrue(enum_members.issubset(dir(sample.Abstract)))
 
-    @unittest.skipIf(sys.pyside63_option_python_enum, "Makes no sense with strict Enums")
+    @unittest.skipIf(sys.pyside6_option_python_enum, "Makes no sense with strict Enums")
     def testSampleNamespaceOptionEnum(self):
         '''Test availability of Option enum from SampleNamespace namespace'''
         enum_members = set(['Option', 'None_', 'RandomNumber', 'UnixTime'])