Remove all references to pyCompatibility

- "pyCompatibility.basestring" are replaced by standard Python3 "str"
- "Sequence" and "Iterable" from "collections" are now directly imported
with "collections.abc"
This commit is contained in:
Candice Bentéjac 2022-12-05 12:40:04 +01:00
parent d2c707f6fa
commit 635f85e7fd
10 changed files with 30 additions and 56 deletions

View file

@ -1,6 +1,6 @@
__version__ = "6.0"
from meshroom.core import desc, Version, pyCompatibility
from meshroom.core import desc, Version
import logging
@ -355,7 +355,7 @@ Many cameras are contributing to the low frequencies and only the best ones cont
def upgradeAttributeValues(self, attrValues, fromVersion):
if fromVersion < Version(6, 0):
outputTextureFileType = attrValues['outputTextureFileType']
if isinstance(outputTextureFileType, pyCompatibility.basestring):
if isinstance(outputTextureFileType, str):
attrValues['colorMapping'] = {}
attrValues['colorMapping']['colorMappingFileType'] = outputTextureFileType
return attrValues