3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-19 03:01:56 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix compatibility with Python 3

Browse source 
- Import "collections" correctly depending on the version of
Python
- Fix regex that raised deprecation warnings in Python 3
This commit is contained in:
Candice Bentéjac 2022-07-19 14:52:18 +02:00
parent 8eaef0b367
commit f2a904ac9b
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meshroom/core/attribute.py
View file

@ -37,7 +37,7 @@ def attributeFactory(description, value, isOutput, node, root=None, parent=None)
class Attribute(BaseObject): class Attribute(BaseObject):
""" """
""" """
stringIsLinkRe = re.compile('^\{[A-Za-z]+[A-Za-z0-9_.]*\}$') stringIsLinkRe = re.compile(r'^\{[A-Za-z]+[A-Za-z0-9_.]*\}$')
def __init__(self, node, attributeDesc, isOutput, root=None, parent=None): def __init__(self, node, attributeDesc, isOutput, root=None, parent=None):
""" """

2
meshroom/ui/reconstruction.py
View file

@ -3,7 +3,6 @@ import logging
import math import math
import os import os
from threading import Thread from threading import Thread
from collections import Iterable
from PySide2.QtCore import QObject, Slot, Property, Signal, QUrl, QSizeF from PySide2.QtCore import QObject, Slot, Property, Signal, QUrl, QSizeF
from PySide2.QtGui import QMatrix4x4, QMatrix3x3, QQuaternion, QVector3D, QVector2D from PySide2.QtGui import QMatrix4x4, QMatrix3x3, QQuaternion, QVector3D, QVector2D
@ -14,6 +13,7 @@ from meshroom import multiview
from meshroom.common.qt import QObjectListModel from meshroom.common.qt import QObjectListModel
from meshroom.core import Version from meshroom.core import Version
from meshroom.core.node import Node, CompatibilityNode, Status, Position from meshroom.core.node import Node, CompatibilityNode, Status, Position
from meshroom.core.pyCompatibility import Iterable
from meshroom.ui.graph import UIGraph from meshroom.ui.graph import UIGraph
from meshroom.ui.utils import makeProperty from meshroom.ui.utils import makeProperty