wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backport/2.8/59497 fix code formatting, remove unused imports (#59518)

Browse source 
* postgresql modules: fix by flake8 (#59497)

(cherry picked from commit fd35833554)

* Backport of 59497: fix code formatting, remove unused imports
This commit is contained in:
Andrey Klychkov 2019-07-29 22:27:50 +03:00 committed by Toshio Kuratomi
parent 282cf8fd78
commit 9d32d06104
5 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/fragments/59497_postgresql-modules-remove-unused-imports.yml Normal file
View file

@ -0,0 +1,5 @@
bugfixes:
- postgresql_db.py - Fix code formatting (https://github.com/ansible/ansible/pull/59497)
- postgresql_ext.py - Remove pg_quote_identifier unused import (https://github.com/ansible/ansible/pull/59497)
- postgresql_lang.py - Remove pg_quote_identifier and to_native unused imports (https://github.com/ansible/ansible/pull/59497)
- postgresql_table.py - Fix code formatting (https://github.com/ansible/ansible/pull/59497)

6
lib/ansible/modules/database/postgresql/postgresql_db.py
View file

@ -246,8 +246,7 @@ def db_create(cursor, db, owner, template, encoding, lc_collate, lc_ctype, conn_
return True
else:
db_info = get_db_info(cursor, db)
if (encoding and
get_encoding_id(cursor, encoding) != db_info['encoding_id']):
if (encoding and get_encoding_id(cursor, encoding) != db_info['encoding_id']):
raise NotSupportedError(
'Changing database encoding is not supported. '
'Current encoding: %s' % db_info['encoding']
@ -279,8 +278,7 @@ def db_matches(cursor, db, owner, template, encoding, lc_collate, lc_ctype, conn
return False
else:
db_info = get_db_info(cursor, db)
if (encoding and
get_encoding_id(cursor, encoding) != db_info['encoding_id']):
if (encoding and get_encoding_id(cursor, encoding) != db_info['encoding_id']):
return False
elif lc_collate and lc_collate != db_info['lc_collate']:
return False

1
lib/ansible/modules/database/postgresql/postgresql_ext.py
View file

@ -149,7 +149,6 @@ from ansible.module_utils.postgres import (
postgres_common_argument_spec,
)
from ansible.module_utils._text import to_native
from ansible.module_utils.database import pg_quote_identifier
executed_queries = []

2
lib/ansible/modules/database/postgresql/postgresql_lang.py
View file

@ -175,8 +175,6 @@ from ansible.module_utils.postgres import (
get_conn_params,
postgres_common_argument_spec,
)
from ansible.module_utils._text import to_native
from ansible.module_utils.database import pg_quote_identifier
executed_queries = []

10
lib/ansible/modules/database/postgresql/postgresql_table.py
View file

@ -485,21 +485,17 @@ def main():
columns = module.params["columns"]
# Check mutual exclusive parameters:
if state == 'absent' and (truncate or newname or columns or tablespace or
like or storage_params or unlogged or
owner or including):
if state == 'absent' and (truncate or newname or columns or tablespace or like or storage_params or unlogged or owner or including):
module.fail_json(msg="%s: state=absent is mutually exclusive with: "
"truncate, rename, columns, tablespace, "
"including, like, storage_params, unlogged, owner" % table)
if truncate and (newname or columns or like or unlogged or
storage_params or owner or tablespace or including):
if truncate and (newname or columns or like or unlogged or storage_params or owner or tablespace or including):
module.fail_json(msg="%s: truncate is mutually exclusive with: "
"rename, columns, like, unlogged, including, "
"storage_params, owner, tablespace" % table)
if newname and (columns or like or unlogged or
storage_params or owner or tablespace or including):
if newname and (columns or like or unlogged or storage_params or owner or tablespace or including):
module.fail_json(msg="%s: rename is mutually exclusive with: "
"columns, like, unlogged, including, "
"storage_params, owner, tablespace" % table)