From 9ab2d20427c67a2a2aadb4aeaa6fe046012edd65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 4 Jun 2016 11:52:42 +0300 Subject: Replace some uses of re.sub with str.lstrip/replace --- lib/sqlalchemy/dialects/oracle/base.py | 2 +- lib/sqlalchemy/dialects/postgresql/base.py | 2 +- lib/sqlalchemy/dialects/sybase/base.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py index 493bf362f..3af308cbb 100644 --- a/lib/sqlalchemy/dialects/oracle/base.py +++ b/lib/sqlalchemy/dialects/oracle/base.py @@ -900,7 +900,7 @@ class OracleIdentifierPreparer(compiler.IdentifierPreparer): ) def format_savepoint(self, savepoint): - name = re.sub(r'^_+', '', savepoint.ident) + name = savepoint.ident.lstrip('_') return super( OracleIdentifierPreparer, self).format_savepoint(savepoint, name) diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index 1bc4409f2..e25ec9aea 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -2085,7 +2085,7 @@ class PGDialect(default.DefaultDialect): attype = re.sub(r'\(.*\)', '', format_type) # strip '[]' from integer[], etc. - attype = re.sub(r'\[\]', '', attype) + attype = attype.replace('[]', '') nullable = not notnull is_array = format_type.endswith('[]') diff --git a/lib/sqlalchemy/dialects/sybase/base.py b/lib/sqlalchemy/dialects/sybase/base.py index fba13c722..fc1792550 100644 --- a/lib/sqlalchemy/dialects/sybase/base.py +++ b/lib/sqlalchemy/dialects/sybase/base.py @@ -552,7 +552,7 @@ class SybaseDialect(default.DefaultDialect): coltype = sqltypes.NULLTYPE if default: - default = re.sub("DEFAULT", "", default).strip() + default = default.replace("DEFAULT", "").strip() default = re.sub("^'(.*)'$", lambda m: m.group(1), default) else: default = None -- cgit v1.2.1