Skip to content

Commit 69b518c

Browse files
Merge pull request #2941 from alicevision/fix/typoInfos
Typo fix: Replace every occurrence of "infos" with "info"
2 parents c036023 + 23efb4d commit 69b518c

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

meshroom/core/node.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -787,32 +787,32 @@ def getDocumentation(self):
787787
else:
788788
return self.nodeDesc.__doc__
789789

790-
def getNodeInfos(self):
790+
def getNodeInfo(self):
791791
if not self.nodeDesc:
792792
return []
793-
infos = OrderedDict([
793+
info = OrderedDict([
794794
("module", self.nodeDesc.__module__),
795795
("modulePath", self.nodeDesc.plugin.path),
796796
])
797-
# > Infos from the plugin module
797+
# > Info from the plugin module
798798
plugin_module = sys.modules.get(self.nodeDesc.__module__)
799799
if getattr(plugin_module, "__author__", None):
800-
infos["author"] = plugin_module.__author__
800+
info["author"] = plugin_module.__author__
801801
if getattr(plugin_module, "__license__", None):
802-
infos["license"] = plugin_module.__license__
802+
info["license"] = plugin_module.__license__
803803
if getattr(plugin_module, "__version__", None):
804-
infos["version"] = plugin_module.__version__
804+
info["version"] = plugin_module.__version__
805805
# > Overrides at the node-level
806806
if getattr(self.nodeDesc, "author", None):
807-
infos["author"] = self.nodeDesc.author
807+
info["author"] = self.nodeDesc.author
808808
if getattr(self.nodeDesc, "version", None):
809-
infos["version"] = self.nodeDesc.version
810-
# > Additional node infos stored in a __nodeInfo__ parameter
811-
additionalNodeInfos = getattr(self.nodeDesc, "__nodeInfo__", None)
812-
if additionalNodeInfos:
813-
for key, value in additionalNodeInfos:
814-
infos[key] = value
815-
return [{"key": k, "value": v} for k, v in infos.items()]
809+
info["version"] = self.nodeDesc.version
810+
# > Additional node information stored in a __nodeInfo__ parameter
811+
additionalNodeInfo = getattr(self.nodeDesc, "__nodeInfo__", None)
812+
if additionalNodeInfo:
813+
for key, value in additionalNodeInfo:
814+
info[key] = value
815+
return [{"key": k, "value": v} for k, v in info.items()]
816816

817817
@property
818818
def packageFullName(self):
@@ -1767,7 +1767,7 @@ def _hasDisplayableShape(self):
17671767
defaultLabel = Property(str, getDefaultLabel, constant=True)
17681768
nodeType = Property(str, nodeType.fget, constant=True)
17691769
documentation = Property(str, getDocumentation, constant=True)
1770-
nodeInfos = Property(Variant, getNodeInfos, constant=True)
1770+
nodeInfo = Property(Variant, getNodeInfo, constant=True)
17711771
positionChanged = Signal()
17721772
position = Property(Variant, position.fget, position.fset, notify=positionChanged)
17731773
x = Property(float, lambda self: self._position.x, notify=positionChanged)

meshroom/ui/components/messaging.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def _getMessagesDict(self, fullDate=False):
5151
return messages
5252

5353
def getMessages(self):
54-
""" Get the messages with simple date infos.
54+
""" Get the messages with simple date information.
5555
Reverse the list to make sure we see the most recent item on top
5656
"""
5757
return self._getMessagesDict()[::-1]

meshroom/ui/qml/GraphEditor/NodeDocumentation.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ FocusScope {
9999
height: childrenRect.height
100100
Layout.preferredWidth: width
101101
spacing: 3
102-
model: node.nodeInfos
102+
model: node.nodeInfo
103103
delegate: nodeInfoItem
104104
}
105105

meshroom/ui/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111

1212
class QmlInstantEngine(QQmlApplicationEngine):
1313
"""
14-
QmlInstantEngine is an utility class helping developing QML applications.
14+
QmlInstantEngine is a utility class helping to develop QML applications.
1515
It reloads itself whenever one of the watched source files is modified.
1616
As it consumes resources, make sure to disable file watching in production mode.
1717
"""
1818

1919
def __init__(self, sourceFile="", watching=True, verbose=False, parent=None):
2020
"""
2121
watching -- Defines whether the watcher is active (default: True)
22-
verbose -- if True, output log infos (default: False)
22+
verbose -- if True, output log information (default: False)
2323
"""
2424
super().__init__(parent)
2525

tests/test_nodes.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from .utils import registerNodeDesc
1212

1313

14-
class TestNodeInfos:
14+
class TestNodeInfo:
1515
plugin = None
1616

1717
@classmethod
@@ -43,13 +43,13 @@ def test_loadedPlugin(self):
4343

4444
nodeDocumentation = node.getDocumentation()
4545
assert nodeDocumentation == "PluginCNodeA"
46-
nodeInfos = {item["key"]: item["value"] for item in node.getNodeInfos()}
47-
assert nodeInfos["module"] == "pluginC.PluginCNodeA"
46+
nodeInfo = {item["key"]: item["value"] for item in node.getNodeInfo()}
47+
assert nodeInfo["module"] == "pluginC.PluginCNodeA"
4848
pluginPath = os.path.join(self.folder, "pluginC", "PluginCNodeA.py")
49-
assert nodeInfos["modulePath"] == Path(pluginPath).as_posix() # modulePath seems to follow linux convention
50-
assert nodeInfos["author"] == "testAuthor"
51-
assert nodeInfos["license"] == "no-license"
52-
assert nodeInfos["version"] == "1.0"
49+
assert nodeInfo["modulePath"] == Path(pluginPath).as_posix() # modulePath seems to follow Linux convention
50+
assert nodeInfo["author"] == "testAuthor"
51+
assert nodeInfo["license"] == "no-license"
52+
assert nodeInfo["version"] == "1.0"
5353

5454

5555
class TestNodeVariables:

0 commit comments

Comments
 (0)