From 3089b86ea646bc0328ce355372848a70c49d0f8e Mon Sep 17 00:00:00 2001 From: hhyo Date: Mon, 1 Apr 2019 17:20:23 +0800 Subject: [PATCH] support python3.4, update version='0.1.6' --- mybatis_mapper2sql/convert.py | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mybatis_mapper2sql/convert.py b/mybatis_mapper2sql/convert.py index 89053e1..2f59302 100644 --- a/mybatis_mapper2sql/convert.py +++ b/mybatis_mapper2sql/convert.py @@ -145,11 +145,11 @@ def convert_trim_where_set(mybatis_mapper, child): convert_string += convert_children(mybatis_mapper, next_child) # Remove prefixOverrides if prefix_overrides: - regex = fr'^[\s]*?({prefix_overrides})' + regex = r'^[\s]*?{}'.format(prefix_overrides) convert_string = re.sub(regex, '', convert_string, count=1, flags=re.I) # Remove suffixOverrides if suffix_overrides: - regex = fr'{suffix_overrides}(\s+--.+)?$' + regex = r'{}(\s+--.+)?$'.format(suffix_overrides) convert_string = re.sub(regex, r'', convert_string, count=1, flags=re.I) # Add Prefix if String is not empty if re.search(r'\S', convert_string): diff --git a/setup.py b/setup.py index d8850b9..aa743b4 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ def run_tests(self): setup( name='mybatis-mapper2sql', - version='0.1.5', + version='0.1.6', author='hhyo', author_email='rtttte@qq.com', url='http://github.com/hhyo/mybatis-mapper2sql',