updates

Author: bender

changes/d4f3dc440ad8e7181a9a30cc4bea2c41.yaml

@@ -0,0 +1,5 @@
+---
+desc: Deprecated ``$lib.text()`` to instead use ``()`` syntax.
+prs: []
+type: feat
+...

synapse/lib/stormtypes.py

@@ -1307,7 +1307,7 @@ class LibBase(Lib):
                     cli> storm if $lib.false { $lib.print('Is True') } else { $lib.print('Is False') }
                     Is False''',
          'type': 'boolean', },
-        {'name': 'text', 'desc': 'Get a Storm Text object. This is deprecated; please use ``$lib.str()`` instead.',
+        {'name': 'text', 'desc': 'Get a Storm Text object. This is deprecated; please use ``()`` instead.',
          'deprecated': {'eolvers': '3.0.0'},
          'type': {'type': 'function', '_funcname': '_text',
                   'args': (
@@ -1685,10 +1685,10 @@ async def _list(self, *vals):
 
     @stormfunc(readonly=True)
     async def _text(self, *args):
-        s_common.deprecated('$lib.text()', curv='2.193.0')
+        s_common.deprecated('$lib.text()', curv='2.194.0')
         runt = s_scope.get('runt')
         if runt:
-            await runt.snap.warnonce('$lib.text() is deprecated. Use $lib.str() instead.')
+            await runt.snap.warnonce('$lib.text() is deprecated. Use () instead.')
         valu = ''.join(args)
         return Text(valu)
 

synapse/tests/test_cortex.py

@@ -5460,7 +5460,7 @@ async def test_storm_ifstmt(self):
             self.len(1, nodes)
 
     async def test_storm_order(self):
-        q = '''[test:str=foo :hehe=bar] $tvar=$lib.text() $tvar.add(1) $tvar.add(:hehe) $lib.print($tvar.str()) '''
+        q = '''[test:str=foo :hehe=bar] $tvar=() $tvar.append(1) $tvar.append(:hehe) $lib.print($lib.str.join('', $tvar)) '''
         async with self.getTestCore() as core:
             mesgs = await core.stormlist(q)
             self.stormIsInPrint('1bar', mesgs)

synapse/tests/test_lib_ast.py

@@ -292,11 +292,11 @@ async def test_ast_runtsafe_bug(self):
         async with self.getTestCore() as core:
             q = '''
                 [test:str=another :hehe=asdf]
-                $s = $lib.text("Foo")
+                $s = ("Foo")
                 $newvar=:hehe
                 -.created
-                $s.add("yar {x}", x=$newvar)
-                $lib.print($s.str())
+                $s.append("yar {x}", x=$newvar)
+                $lib.print($lib.str.join('', $s))
             '''
             mesgs = await core.stormlist(q)
             prints = [m[1]['mesg'] for m in mesgs if m[0] == 'print']

synapse/tests/test_lib_stormtypes.py

@@ -1571,23 +1571,18 @@ async def test_storm_lib_list(self):
             self.eq(ret, ('bar', 'baz', 'foo',))
 
             # Sort a few text objects
-            q = '$foo=$lib.text(foo) $bar=$lib.text(bar) $baz=$lib.text(baz) $v=($foo, $bar, $baz) $v.sort() return ($v)'
+            q = '$foo=("foo") $bar=("bar") $baz=("baz") $v=($foo, $bar, $baz) $v.sort() return ($v)'
             ret = await core.callStorm(q)
             self.eq(ret, ('bar', 'baz', 'foo',))
 
             # incompatible sort types
             with self.raises(s_exc.StormRuntimeError):
                 await core.callStorm('$v=(foo,bar,(1)) $v.sort() return ($v)')
 
-            # mix Prims and heavy objects
-            with self.raises(s_exc.StormRuntimeError):
-                q = '$foo=$lib.text(foo) $bar=$lib.text(bar) $v=($foo, aString, $bar,) $v.sort() return ($v)'
-                await core.callStorm(q)
-
             q = '$l = (1, 2, (3), 4, 1, (3), 3, asdf) return ( $l.unique() )'
             self.eq(['1', '2', 3, '4', '3', 'asdf'], await core.callStorm(q))
 
-            q = '$a=$lib.text(hehe) $b=$lib.text(haha) $c=$lib.text(hehe) $foo=($a, $b, $c) return ($foo.unique())'
+            q = '$a=("hehe") $b=("haha") $c=("hehe") $foo=($a, $b, $c) return ($foo.unique())'
             self.eq(['hehe', 'haha'], await core.callStorm(q))
 
             await core.addUser('lowuser1')
@@ -1805,13 +1800,13 @@ async def test_storm_csv(self):
     async def test_storm_text(self):
         async with self.getTestCore() as core:
             nodes = await core.nodes('''
-                [ test:int=10 ] $text=$lib.text(hehe) { +test:int>=10 $text.add(haha) }
-                [ test:str=$text.str() ] +test:str''')
+                [ test:int=10 ] $text=() $text.append(hehe) { +test:int>=10 $text.append(haha) }
+                [ test:str=$lib.str.join('', $text) ] +test:str''')
             self.len(1, nodes)
             self.eq(nodes[0].ndef, ('test:str', 'hehehaha'))
 
-            q = '''$t=$lib.text(beepboop) $lib.print($lib.len($t))
-            $t.add("more!") $lib.print($lib.len($t))
+            q = '''$t=() $t.append(beepboop) $lib.print($lib.len($lib.str.join('',$t)))
+            $t.append("more!") $lib.print($lib.len($lib.str.join('',$t)))
             '''
             msgs = await core.stormlist(q)
             self.stormIsInPrint('8', msgs)
@@ -2216,7 +2211,7 @@ def __eq__(self, othr):
 
             # text
             q = '''
-                $text = $lib.text(beepboopgetthejedi)
+                $text = () $text.append(beepboopgetthejedi)
                 $set = $lib.set($text)
             '''
             msgs = await core.stormlist(q)
@@ -3431,8 +3426,6 @@ async def test_storm_lib_vars_type(self):
             self.eq('telepath:proxy:method', await core.callStorm('return( $lib.vars.type($lib.telepath.open($url).getCellInfo) )', opts))
             self.eq('telepath:proxy:genrmethod', await core.callStorm('return( $lib.vars.type($lib.telepath.open($url).storm) )', opts))
 
-            self.eq('text', await core.callStorm('return ( $lib.vars.type($lib.text(hehe)) )'))
-
             self.eq('node', await core.callStorm('[test:str=foo] return ($lib.vars.type($node))'))
             self.eq('node:props', await core.callStorm('[test:str=foo] return ($lib.vars.type($node.props))'))
             self.eq('node:data', await core.callStorm('[test:str=foo] return ($lib.vars.type($node.data))'))