HH-137697 fix errors

vikkuznecova · vikkuznecova · commit df3c30aef9f9 · 2021-10-25T17:04:03.000+05:00
diff --git a/rivescript/brain.py b/rivescript/brain.py
@@ -449,7 +449,7 @@ def reply_regexp(self, user, regexp):
         if regexp[-2:] == ' *':
             regexp = regexp.replace(regexp[-2:], '( *|)')
         if regexp[:2] == '* ':
-            regexp = regexp.replace(regexp[:2], '(| *)')
+            regexp = regexp.replace(regexp[:2], '(|* )')
         if '*' in regexp:
             for i in range(len(regexp)):
                 if regexp[i] == '*':
@@ -579,6 +579,7 @@ def process_tags(self, user, msg, reply, st=[], bst=[], depth=0, ignore_object_e
         """
         stars = ['']
         stars.extend(st)
+        stars = [star.strip() if star else star for star in stars]
         botstars = ['']
         botstars.extend(bst)
         if len(stars) == 1:
diff --git a/tests/test_botvars.py b/tests/test_botvars.py
@@ -49,7 +49,7 @@ def test_global_variables(self):
             - Debug mode is: <env debug>
 
             + set debug mode *
-            - <env debug=<person>>Switched to <person>.
+            - <env debug=<star>>Switched to <star>.
 
             + are you testing
             - Testing: <env testing>
diff --git a/tests/test_replies.py b/tests/test_replies.py
@@ -113,14 +113,14 @@ def test_embedded_tags(self):
             - <set name=<b>Name</b>>This has some non-RS <em>tags</em> in it.
             
             + i am from rus*
-            - You are from Russia?
+            - Are you from Russia?
             
             + i am from *lia
-            * <star> == brasi => You are from Brasilia?
-            - You are from big city?
+            * <star> == brasi => Are you from Brasilia?
+            - Are you from big city?
             
             + hello my * *friend
-            - I love you, my <person>!
+            - I love you, my <star>!
             
             + *
             - Random reply
@@ -130,12 +130,12 @@ def test_embedded_tags(self):
         self.reply("My name is Bob.", "I thought your name was Alice?")
         self.reply("What is my name?", "Your name is Bob, right?")
         self.reply("HTML Test", "This has some non-RS <em>tags</em> in it.")
-        self.reply("I am from Russia", "You are from Russia?")
-        self.reply("I am from RussiaFederation", "You are from Russia?")
+        self.reply("I am from Russia", "Are you from Russia?")
+        self.reply("I am from RussiaFederation", "Are you from Russia?")
         self.reply("I am from Russia Federation", "Random reply")
         self.reply("Hello my best friend", "I love you, my best!")
         self.reply("Hello my best best friend", "I love you, my best best!")
         self.reply("Hello my best little bestfriend", "I love you, my best little!")
         self.reply("Hello my friend", "I love you, my !")
-        self.reply("I am from Brasilia", "You are from Brasilia?")
-        self.reply("I am from Sicilia", "You are from big city?")
+        self.reply("I am from Brasilia", "Are you from Brasilia?")
+        self.reply("I am from Sicilia", "Are you from big city?")
diff --git a/tests/test_unicode.py b/tests/test_unicode.py
@@ -35,6 +35,7 @@ def test_unicode(self):
             - <sentence> who?
 
             + *
+            % * who
             - Haha! <sentence>!
 
             // And with UTF-8.
