Merge ~barryprice/postgresql-charm/+git/postgresql-charm:black into postgresql-charm:master

Proposed by Barry Price
Status: Merged
Approved by: 🤖 Canonical IS Review Bot
Approved revision: 59b1cb5b0301a456ae274a0ada11d84d0fb36b42
Merged at revision: 4f4bbc7e8494e1cc4d234c60d6e343a04691346d
Proposed branch: ~barryprice/postgresql-charm/+git/postgresql-charm:black
Merge into: postgresql-charm:master
Diff against target: 26 lines (+2/-2)
2 files modified
reactive/postgresql/client.py (+1/-1)
reactive/postgresql/postgresql.py (+1/-1)
Reviewer Review Type Date Requested Status
🤖 Canonical IS Review Bot Approve
Canonical IS Reviewers Pending
Review via email: mp+446387@code.launchpad.net

Commit message

Linting

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 Canonical IS Review Bot (canonical-is-reviewbot) wrote :

Proxy approval for axino

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 4f4bbc7e8494e1cc4d234c60d6e343a04691346d

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/reactive/postgresql/client.py b/reactive/postgresql/client.py
index 9df9db3..1fde5e1 100644
--- a/reactive/postgresql/client.py
+++ b/reactive/postgresql/client.py
@@ -340,7 +340,7 @@ def ensure_db_relation_resources(rel):
340 extensions = []340 extensions = []
341 for ext in extensions_list:341 for ext in extensions_list:
342 ext_sch = ext.split(":")342 ext_sch = ext.split(":")
343 if(len(ext_sch) < 2):343 if len(ext_sch) < 2:
344 ext_sch.append("public")344 ext_sch.append("public")
345 extensions.append(tuple(ext_sch))345 extensions.append(tuple(ext_sch))
346 postgresql.ensure_extensions(con, extensions)346 postgresql.ensure_extensions(con, extensions)
diff --git a/reactive/postgresql/postgresql.py b/reactive/postgresql/postgresql.py
index 3101c7e..1921c76 100644
--- a/reactive/postgresql/postgresql.py
+++ b/reactive/postgresql/postgresql.py
@@ -127,7 +127,7 @@ def point_version():
127def has_version(ver):127def has_version(ver):
128 """128 """
129 PostgreSQL version greater or equal then the one provided.129 PostgreSQL version greater or equal then the one provided.
130 130
131 Args:131 Args:
132 ver: Version number to compare against132 ver: Version number to compare against
133 Returns:133 Returns:

Subscribers

People subscribed via source and target branches

to all changes: