implementation 11 corrections pip8 2

Author: AntonCharnichenka

final_task/pycalc/__main__.py

@@ -15,7 +15,7 @@
 def createparser():
     """Creates parser with one positional argument 'expression' to parse user's mathematical expression"""
     parser = argparse.ArgumentParser(prog='pycalc', description='pure Python command line calculator',
-                                     epilog="""Anton Charnichenka for EPAM: Introduction to Python 
+                                     epilog="""Anton Charnichenka for EPAM: Introduction to Python
                                      and Golang programming, 2018.""")
     parser.add_argument('expression', help="""mathematical expression string to evaluate;
     implicit multiplication is supported""")

final_task/pycalc/pycalclib.py

@@ -6,29 +6,29 @@
 
 
 # r_strings that are used to find operators / functions / etc
-r_one_sign_operators = ['^\+', '^-', '^\*', '^/', '^\^', '^%']
-r_two_signs_operators = ['^//', '^\*\*']
-r_comparison_operators = ['^<=', '^>=', '^<', '^>', '^==', '^!=']
-r_functions = ['^acosh', '^acos', '^asinh', '^asin', '^atan2', '^atanh', '^atan', '^ceil', '^copysign', '^cosh',
-               '^cos', '^degrees', '^erfc', '^erf', '^expm1', '^exp', '^fabs', '^factorial', '^floor', '^fmod',
-               '^gamma', '^gcd', '^hypot', '^isfinite', '^isinf', '^isnan', '^ldexp', '^lgamma', '^log10', '^log1p',
-               '^log2', '^log', '^pow', '^radians', '^sinh', '^sin', '^sqrt', '^tanh', '^tan',  '^trunc',
-               '^abs', '^round']
-r_negative_functions = ['^-acosh', '^-acos', '^-asinh', '^-asin', '^-atan2', '^-atanh', '^-atan', '^-ceil',
-                        '^-copysign', '^-cosh', '^-cos', '^-degrees', '^-erfc', '^-erf', '^-expm1', '^-exp',
-                        '^-fabs', '^-factorial', '^-floor', '^-fmod', '^-gamma', '^-gcd', '^-hypot', '^-isfinite',
-                        '^-isinf', '^-isnan', '^-ldexp', '^-lgamma', '^-log10', '^-log1p', '^-log2', '^-log',
-                        '^-pow', '^-radians', '^-sinh', '^-sin', '-^sqrt', '^-tanh', '^-tan',  '^-trunc',
-                        '^-abs', '^-round']
-r_constants = ['^e', '^pi', '^tau', '^inf', '^nan']
-r_negative_constants = ['^\-e', '^\-pi', '^\-tau', '^\-inf', '^\-nan']
-r_int_numbers = ['^\d+']
-r_negative_int_numbers = ['^\-\d+']
-r_float_numbers = ['^\d+\.\d+|^\.\d+']
-r_negative_float_numbers = ['^\-\d+\.\d+|^\-\.\d+']
-r_brackets = ['^\(', '^\)']
-r_comma = ['^,']
-r_space = ['^\s']
+r_one_sign_operators = [r'^\+', r'^-', r'^\*', r'^/', r'^\^', r'^%']
+r_two_signs_operators = [r'^//', r'^\*\*']
+r_comparison_operators = [r'^<=', r'^>=', r'^<', r'^>', r'^==', r'^!=']
+r_functions = [r'^acosh', r'^acos', r'^asinh', r'^asin', r'^atan2', r'^atanh', r'^atan', r'^ceil', r'^copysign', r'^cosh',
+               r'^cos', r'^degrees', r'^erfc', r'^erf', r'^expm1', r'^exp', r'^fabs', r'^factorial', r'^floor', r'^fmod',
+               r'^gamma', r'^gcd', r'^hypot', r'^isfinite', r'^isinf', r'^isnan', r'^ldexp', r'^lgamma', r'^log10', r'^log1p',
+               r'^log2', r'^log', r'^pow', r'^radians', r'^sinh', r'^sin', r'^sqrt', r'^tanh', r'^tan',  r'^trunc',
+               r'^abs', r'^round']
+r_negative_functions = [r'^-acosh', r'^-acos', r'^-asinh', r'^-asin', r'^-atan2', r'^-atanh', r'^-atan', r'^-ceil',
+                        r'^-copysign', r'^-cosh', r'^-cos', r'^-degrees', r'^-erfc', r'^-erf', r'^-expm1', r'^-exp',
+                        r'^-fabs', r'^-factorial', r'^-floor', r'^-fmod', r'^-gamma', r'^-gcd', r'^-hypot', r'^-isfinite',
+                        r'^-isinf', r'^-isnan', r'^-ldexp', r'^-lgamma', r'^-log10', r'^-log1p', r'^-log2', r'^-log',
+                        r'^-pow', r'^-radians', r'^-sinh', r'^-sin', r'-^sqrt', r'^-tanh', r'^-tan',  r'^-trunc',
+                        r'^-abs', r'^-round']
+r_constants = [r'^e', r'^pi', r'^tau', r'^inf', r'^nan']
+r_negative_constants = [r'^\-e', r'^\-pi', r'^\-tau', r'^\-inf', r'^\-nan']
+r_int_numbers = [r'^\d+']
+r_negative_int_numbers = [r'^\-\d+']
+r_float_numbers = [r'^\d+\.\d+|^\.\d+']
+r_negative_float_numbers = [r'^\-\d+\.\d+|^\-\.\d+']
+r_brackets = [r'^\(', r'^\)']
+r_comma = [r'^,']
+r_space = [r'^\s']
 # all r_strings together
 r_strings = r_brackets + r_two_signs_operators + r_one_sign_operators + r_negative_functions + r_functions + \
             r_comparison_operators + r_negative_float_numbers + r_negative_int_numbers + r_negative_constants + \

final_task/pycalc/tokenizer.py

@@ -62,7 +62,7 @@ def extract_tokens(self):
 
         while len(self.user_expr) != 0:
             for r_string in self.r_strings:
-                search_result = re.search(r''.join(r_string), self.user_expr)
+                search_result = re.search(r_string, self.user_expr)
                 if search_result is not None:
                     if (search_result.group(0) == '-' and len(self.tokens) != 0
                             and self.tokens[-1] in (['('] + self.operators[2:])):