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 493bf362fb1ba5a368974c4f2273d2f43cdf7fb2..3af308cbb0dd5c44b819970197f9a0079b93c2f2 100644 (file)
--- 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 1bc4409f288617b6469d284731ee24606fcaac86..e25ec9aea1192427d22462e9b703319735908450 100644 (file)
--- 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 fba13c722d626847398cd6c36e4e433f86c1c6b6..fc1792550b0fc0aaa317034a3e0fd68949a79004 100644 (file)
--- 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