Merge beta to master #13953
Merged
Merge beta to master #13953
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From translation svn revision: 68826 Authors: Bernd Dorer <bdorer@mailbox.org> David Parduhn <xkill85@gmx.net> Rene Linke <rene.linke@hamburg.de> Adriani Botez <adriani.botez@gmail.com> Karl Eick <hozosch@web.de> Robert Hänggi <aarjay.robert@gmail.com> Astrid Waldschmetterling <a.r.waldschmetterling@gmx.de> Stats: 4 4 source/locale/de/LC_MESSAGES/nvda.po 1 file changed, 4 insertions(+), 4 deletions(-)
From translation svn revision: 68826 Authors: Juan C. buno <oprisniki@gmail.com> Noelia Martinez <nrm1977@gmail.com> Remy Ruiz <remyruiz@gmail.com> Jose M. Delicado <jm.delicado@nvda.es> Stats: 0 1 user_docs/es/changes.t2t 1 file changed, 1 deletion(-)
From translation svn revision: 68826 Authors: Juan C. buno <oprisniki@gmail.com> Ivan Novegil <ivan.novegil@nvda.es> Javier Curras <javier.curras@nvda.es> Jose M. Delicado <jm.delicado@nvda.es> Stats: 0 1 user_docs/gl/changes.t2t 1 file changed, 1 deletion(-)
From translation svn revision: 68826 Authors: wangjanli@gmail.com maro.zhang@gmail.com Aaron Wu <waaron2000@gmail.com> Victor Cai <surfer0627@gmail.com> haach111000@gmail.com Stats: 15 15 source/locale/zh_TW/characterDescriptions.dic 1 file changed, 15 insertions(+), 15 deletions(-)
From translation svn revision: 68826
From translation svn revision: 68956 Authors: Simone Dal Maso <simone.dalmaso@gmail.com> Alberto Buffolino <a.buffolino@gmail.com> Stats: 3 3 source/locale/it/LC_MESSAGES/nvda.po 1 file changed, 3 insertions(+), 3 deletions(-)
From translation svn revision: 68956 Authors: Beqa Gozalishvili <beqaprogger@gmail.com> Goderdzi Gogoladze <goderdzigogoladze@gmail.com> Stats: 2 2 source/locale/ka/symbols.dic 1 file changed, 2 insertions(+), 2 deletions(-)
From translation svn revision: 68956 Authors: Zvonimir Stanecic <9a5dsz@gozaltech.org> Aleksandr Lin'kov <kvark128@yandex.ru> Stats: 5 5 source/locale/ru/LC_MESSAGES/nvda.po 1 file changed, 5 insertions(+), 5 deletions(-)
From translation svn revision: 68956
2022.3 Final master to beta merge
* add release blurb * make user guide updates consistent * add hyphen to on-screen Co-authored-by: Bill Dengler <codeofdusk@gmail.com>
Fixes #13923 Summary of the issue: Performing type checks for collections fail The following code raises an error when FlagValueEnum is defined as FlagValueEnum(enum.EnumMeta, _DisplayStringEnumMixin, FeatureFlagEnumProtocol): pass In the NVDA python console >>>import collections.abc >>>isinstance(12, collections.abc.Sized) Traceback (most recent call last): File "<console>", line 1, in <module> File "C:\Users\sean\AppData\Local\Programs\Python\Python37-32\lib\abc.py", line 139, in __instancecheck__ return _abc_instancecheck(cls, instance) File "C:\Users\sean\AppData\Local\Programs\Python\Python37-32\lib\abc.py", line 143, in __subclasscheck__ return _abc_subclasscheck(cls, subclass) File "C:\Users\sean\AppData\Local\Programs\Python\Python37-32\lib\abc.py", line 143, in __subclasscheck__ return _abc_subclasscheck(cls, subclass) File "C:\Users\sean\AppData\Local\Programs\Python\Python37-32\lib\abc.py", line 143, in __subclasscheck__ return _abc_subclasscheck(cls, subclass) [Previous line repeated 1 more time] TypeError: descriptor '__subclasses__' of 'type' object needs an argument Description of user facing changes API is fixed for performing type checks in collections. Description of development approach Removing typing.Collection or enum.EnumMeta from the MRO both resolve the python console / API bug. As a result, I assume the bug is some sort of class conflict between typing.Collection and enum.EnumMeta . We could resolve this by creating a metaclass. However, I believe the already included EnumMeta class should cover what we wanted in type hinting typing.Collection. The EnumMeta metaclass is responsible for providing the __contains__(), __dir__(), __iter__() and other methods that allow one to do things with an Enum class that fail on a typical class, such as list(Color) or some_enum_var in Color. EnumMeta is responsible for ensuring that various other methods on the final Enum class are correct (such as __new__(), __getnewargs__(), __str__() and __repr__()). https://docs.python.org/3/library/enum.html#enum-classes.
feerrenrut
approved these changes
Jul 27, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Must be merge commit not squash merge