diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2016-06-06 15:54:53 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ln3.zzzcomputing.com> | 2016-06-06 15:54:53 -0400 |
| commit | bc4c6c44af6681ade49892d46dadb04f141f5450 (patch) | |
| tree | 826034ad332a6644d46b9616905add094a2daf7d /lib | |
| parent | a5f92314edd45a2e411b0f5b3c4d4bec0c7d92f8 (diff) | |
| parent | 9393317affc11e8545e5029cb8d55cea7e57c342 (diff) | |
| download | sqlalchemy-bc4c6c44af6681ade49892d46dadb04f141f5450.tar.gz | |
Merge "Replace some uses of re.sub with str.lstrip/replace"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 2 | ||||
| -rw-r--r-- | 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 |