Skip to content

Commit ac75f15

Browse files
committed
reformat code, simplify tests (needless args)
1 parent 2a64ba5 commit ac75f15

File tree

4 files changed

+135
-172
lines changed

4 files changed

+135
-172
lines changed

Diff for: testgres/connection.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
default_dbname as _default_dbname, \
1818
default_username as _default_username
1919

20-
2120
# export these exceptions
2221
InternalError = pglib.InternalError
2322
ProgrammingError = pglib.ProgrammingError
@@ -36,11 +35,7 @@ class NodeConnection(object):
3635
Transaction wrapper returned by Node
3736
"""
3837

39-
def __init__(self,
40-
node,
41-
dbname=None,
42-
username=None,
43-
password=None):
38+
def __init__(self, node, dbname=None, username=None, password=None):
4439

4540
# Use default user if not specified
4641
dbname = dbname or _default_dbname()

Diff for: testgres/node.py

+1-9
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,7 @@ def __bool__(self):
6969

7070

7171
class PostgresNode(object):
72-
def __init__(self,
73-
name=None,
74-
port=None,
75-
base_dir=None,
76-
use_logging=False):
72+
def __init__(self, name=None, port=None, base_dir=None, use_logging=False):
7773
"""
7874
Create a new node manually.
7975
@@ -609,7 +605,6 @@ def cleanup(self, max_attempts=3):
609605

610606
@method_decorator(positional_args_hack(['query'], ['dbname', 'query']))
611607
def psql(self,
612-
*,
613608
query=None,
614609
filename=None,
615610
dbname=None,
@@ -668,7 +663,6 @@ def psql(self,
668663
@method_decorator(positional_args_hack(['dbname', 'query']))
669664
def safe_psql(self,
670665
query,
671-
*,
672666
dbname=None,
673667
username=None,
674668
input=None):
@@ -747,7 +741,6 @@ def restore(self, filename, dbname=None, username=None):
747741
@method_decorator(positional_args_hack(['dbname', 'query']))
748742
def poll_query_until(self,
749743
query,
750-
*,
751744
dbname=None,
752745
username=None,
753746
max_attempts=0,
@@ -816,7 +809,6 @@ def poll_query_until(self,
816809
@method_decorator(positional_args_hack(['dbname', 'query']))
817810
def execute(self,
818811
query,
819-
*,
820812
dbname=None,
821813
username=None,
822814
password=None,

Diff for: testgres/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ def positional_args_hack(*special_cases):
250250
'special_cases' into named args.
251251
252252
Example:
253-
@positional_args_hack([['dbname', 'query']])
253+
@positional_args_hack(['abc'], ['def', 'abc'])
254254
def some_api_func(...)
255255
256256
This is useful for compatibility.

0 commit comments

Comments
 (0)