[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/04: Merge branch 'master' into next
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 03/04: Merge branch 'master' into next |
Date: |
Thu, 26 Jan 2017 14:46:41 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit a4964a05c6f341ca23fd527712965ff8d173c1a3
Merge: 7c7fc16 3c78606
Author: Sebastian Koslowski <address@hidden>
Date: Wed Jan 25 20:57:02 2017 +0100
Merge branch 'master' into next
grc/core/Port.py | 193 ++++++++++++++++++++++------------------
grc/core/generator/Generator.py | 6 +-
2 files changed, 107 insertions(+), 92 deletions(-)
diff --cc grc/core/Port.py
index 88601dc,f740a69..1386435
--- a/grc/core/Port.py
+++ b/grc/core/Port.py
@@@ -148,17 -181,22 +179,16 @@@ class Port(Element)
return Constants.TYPE_TO_SIZEOF.keys()
def is_type_empty(self):
- return not self._n['type']
+ return not self._n['type'] or not
self.get_parent().resolve_dependencies(self._n['type'])
def validate(self):
- Element.validate(self)
if self.get_type() not in self.get_types():
- self.add_error_message('Type "{0}" is not a possible
type.'.format(self.get_type()))
+ self.add_error_message('Type "{}" is not a possible
type.'.format(self.get_type()))
platform = self.get_parent().get_parent().get_parent()
if self.get_domain() not in platform.domains:
- self.add_error_message('Domain key "{0}" is not
registered.'.format(self.get_domain()))
+ self.add_error_message('Domain key "{}" is not
registered.'.format(self.get_domain()))
if not self.get_enabled_connections() and not self.get_optional():
self.add_error_message('Port is not connected.')
- # Message port logic
- if self.get_type() == 'msg':
- if self.get_nports():
- self.add_error_message('A port of type "msg" cannot have
"nports" set.')
- if self.get_vlen() != 1:
- self.add_error_message('A port of type "msg" must have a
"vlen" of 1.')
def rewrite(self):
"""