rename "types" to "common" to avoid name conflict

types is already a standard python package
This commit is contained in:
Yann Lanthony 2017-09-25 20:04:41 +02:00
parent 51a9b0e316
commit 547e6c93b6
5 changed files with 3 additions and 3 deletions

View file

@ -12,7 +12,7 @@ from pprint import pprint
from . import stats from . import stats
from meshroom import processGraph as pg from meshroom import processGraph as pg
from meshroom.types import BaseObject, Model, Slot, Signal, Property from meshroom.common import BaseObject, Model, Slot, Signal, Property
# Replace default encoder to support Enums # Replace default encoder to support Enums
DefaultJSONEncoder = json.JSONEncoder # store the original one DefaultJSONEncoder = json.JSONEncoder # store the original one

View file

@ -2,8 +2,8 @@ import pytest
from PySide2.QtCore import QObject, Property from PySide2.QtCore import QObject, Property
from meshroom.types.core import CoreModel from meshroom.common.core import CoreModel
from meshroom.types.qt import QObjectListModel, QTypedObjectListModel from meshroom.common.qt import QObjectListModel, QTypedObjectListModel
class DummyNode(QObject): class DummyNode(QObject):