From: Ville Skyttä <ville.skytta@iki.fi>
Date: Mon, 6 Jun 2016 16:37:31 +0000 (-0400)
Subject: Replace some uses of re.sub with str.lstrip/replace
X-Git-Tag: rel_1_1_0b1~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9393317affc11e8545e5029cb8d55cea7e57c342;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Replace some uses of re.sub with str.lstrip/replace

Change-Id: I98cd60b6830ee94e39ba9307523a9e8fb93bf4e8
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/280
---

diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 493bf362fb..3af308cbb0 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 1bc4409f28..e25ec9aea1 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 fba13c722d..fc1792550b 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