[Commit-gnuradio] [gnuradio] 02/08: grc: mark param type multiline as protected

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 8b14a84ef8b8a73db002153cb398f79f1343ebc2
Author: Sebastian Koslowski <address@hidden>
Date:   Thu Aug 20 14:01:04 2015 +0200

    grc: mark param type multiline as protected
---
 grc/base/Block.py   | 2 +-
 grc/gui/Param.py    | 2 +-
 grc/python/Param.py | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/grc/base/Block.py b/grc/base/Block.py
index b7918d1..77c3145 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -204,7 +204,7 @@ class Block(Element):
                 block=self,
                 n=odict({'name': 'Comment',
                          'key': 'comment',
-                         'type': 'multiline',
+                         'type': '_multiline',
                          'hide': 'part',
                          'value': '',
                          'tab': ADVANCED_PARAM_TAB
diff --git a/grc/gui/Param.py b/grc/gui/Param.py
index ca0a8c6..ec4f7d5 100644
--- a/grc/gui/Param.py
+++ b/grc/gui/Param.py
@@ -320,7 +320,7 @@ class Param(Element):
         elif self.get_options():
             input_widget = EnumEntryParam(self, *args, **kwargs)
 
-        elif self.get_type() == 'multiline':
+        elif self.get_type() == '_multiline':
             input_widget = MultiLineEntryParam(self, *args, **kwargs)
 
         else:
diff --git a/grc/python/Param.py b/grc/python/Param.py
index 27e5b76..50723ed 100644
--- a/grc/python/Param.py
+++ b/grc/python/Param.py
@@ -62,7 +62,7 @@ class Param(_Param, _GUIParam):
         'complex', 'real', 'float', 'int',
         'complex_vector', 'real_vector', 'float_vector', 'int_vector',
         'hex', 'string', 'bool',
-        'file_open', 'file_save', 'multiline',
+        'file_open', 'file_save', '_multiline',
         'id', 'stream_id',
         'grid_pos', 'notebook', 'gui_hint',
         'import',
@@ -266,7 +266,7 @@ class Param(_Param, _GUIParam):
         #########################
         # String Types
         #########################
-        elif t in ('string', 'file_open', 'file_save', 'multiline'):
+        elif t in ('string', 'file_open', 'file_save', '_multiline'):
             #do not check if file/directory exists, that is a runtime issue
             try:
                 e = self.get_parent().get_parent().evaluate(v)
@@ -405,7 +405,7 @@ class Param(_Param, _GUIParam):
         """
         v = self.get_value()
         t = self.get_type()
-        if t in ('string', 'file_open', 'file_save', 'multiline'): #string 
types
+        if t in ('string', 'file_open', 'file_save', '_multiline'):  # string 
types
             if not self._init: self.evaluate()
             if self._stringify_flag: return '"%s"'%v.replace('"', '\"')
             else: return v