Skip to content

Commit 14b58e9

Browse files
authored
Merge pull request #716 from vagos/future
Remove lists as default arguments in functions
2 parents 733c8b8 + 596facf commit 14b58e9

File tree

14 files changed

+63
-37
lines changed

14 files changed

+63
-37
lines changed

compiler/definitions/ir/dfg_node.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ class DFGNode:
2727
def __init__(
2828
self,
2929
cmd_invocation_with_io_vars,
30-
com_redirs=[],
31-
com_assignments=[],
30+
com_redirs=None,
31+
com_assignments=None,
3232
parallelizer_list=None,
3333
cmd_related_properties=None,
3434
):
35-
# TODO []: default parameters!
35+
com_redirs = [] if com_redirs is None else com_redirs
36+
com_assignments = [] if com_assignments is None else com_assignments
3637

3738
## @KK: can this be deleted? Was there another id in the member attributes before?
3839
## Add a unique identifier to each DFGNode since id() is not guaranteed to be unique for objects that have different lifetimes.

compiler/definitions/ir/nodes/dfs_split_reader.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@ def __init__(
99
outputs,
1010
com_name,
1111
com_category,
12-
com_options=[],
13-
com_redirs=[],
14-
com_assignments=[],
12+
com_options=None,
13+
com_redirs=None,
14+
com_assignments=None,
1515
):
16+
com_options = [] if com_options is None else com_options
17+
com_redirs = [] if com_redirs is None else com_redirs
18+
com_assignments = [] if com_assignments is None else com_assignments
19+
1620
super().__init__(
1721
inputs,
1822
outputs,

compiler/definitions/ir/nodes/dgsh_tee.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010

1111

1212
class DGSHTee(DFGNode):
13-
def __init__(self, cmd_invocation_with_io_vars, com_redirs=[], com_assignments=[]):
14-
# TODO []: default
13+
def __init__(self, cmd_invocation_with_io_vars, com_redirs=None, com_assignments=None):
14+
com_redirs = [] if com_redirs is None else com_redirs
15+
com_assignments = [] if com_assignments is None else com_assignments
1516
super().__init__(
1617
cmd_invocation_with_io_vars,
1718
com_redirs=com_redirs,

compiler/definitions/ir/nodes/eager.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212

1313

1414
class Eager(DFGNode):
15-
def __init__(self, cmd_invocation_with_io_vars, com_redirs=[], com_assignments=[]):
16-
# TODO []: default
15+
def __init__(self, cmd_invocation_with_io_vars, com_redirs=None, com_assignments=None):
16+
com_redirs = [] if com_redirs is None else com_redirs
17+
com_assignments = [] if com_assignments is None else com_assignments
18+
1719
super().__init__(
1820
cmd_invocation_with_io_vars,
1921
com_redirs=com_redirs,

compiler/definitions/ir/nodes/hdfs_cat.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ def __init__(
88
outputs,
99
com_name,
1010
com_category,
11-
com_options=[],
12-
com_redirs=[],
13-
com_assignments=[],
11+
com_options=None,
12+
com_redirs=None,
13+
com_assignments=None,
1414
):
15+
com_options = [] if com_options is None else com_options
16+
com_redirs = [] if com_redirs is None else com_redirs
17+
com_assignments = [] if com_assignments is None else com_assignments
18+
1519
assert str(com_name) == "hdfs"
1620
assert str(com_options[0][1]) == "dfs" and str(com_options[1][1]) == "-cat"
1721
super().__init__(

compiler/definitions/ir/nodes/pash_split.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ class Split(DFGNode):
1414
def __init__(
1515
self,
1616
cmd_invocation_with_io_vars,
17-
com_redirs=[],
18-
com_assignments=[],
17+
com_redirs=None,
18+
com_assignments=None,
1919
parallelizer_list=None,
2020
cmd_related_properties=None,
2121
):
22-
# TODO []: default arguments!
22+
com_redirs = [] if com_redirs is None else com_redirs
23+
com_assignments = [] if com_assignments is None else com_assignments
2324
super().__init__(
2425
cmd_invocation_with_io_vars=cmd_invocation_with_io_vars,
2526
com_redirs=com_redirs,

compiler/definitions/ir/nodes/r_merge.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ class RMerge(DFGNode):
1010
def __init__(
1111
self,
1212
cmd_invocation_with_io_vars,
13-
com_redirs=[],
14-
com_assignments=[],
13+
com_redirs=None,
14+
com_assignments=None,
1515
parallelizer_list=None,
1616
cmd_related_properties=None,
1717
):
18-
# TODO []: default arguments!
18+
com_redirs = [] if com_redirs is None else com_redirs
19+
com_assignments = [] if com_assignments is None else com_assignments
1920
super().__init__(
2021
cmd_invocation_with_io_vars=cmd_invocation_with_io_vars,
2122
com_redirs=com_redirs,

compiler/definitions/ir/nodes/r_split.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ class RSplit(DFGNode):
2121
def __init__(
2222
self,
2323
cmd_invocation_with_io_vars,
24-
com_redirs=[],
25-
com_assignments=[],
24+
com_redirs=None,
25+
com_assignments=None,
2626
parallelizer_list=None,
2727
cmd_related_properties=None,
2828
):
29-
# TODO []: default arguments!
29+
com_redirs = [] if com_redirs is None else com_redirs
30+
com_assignments = [] if com_assignments is None else com_assignments
3031
super().__init__(
3132
cmd_invocation_with_io_vars=cmd_invocation_with_io_vars,
3233
com_redirs=com_redirs,

compiler/definitions/ir/nodes/r_unwrap.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ class RUnwrap(DFGNode):
1010
def __init__(
1111
self,
1212
cmd_invocation_with_io_vars,
13-
com_redirs=[],
14-
com_assignments=[],
13+
com_redirs=None,
14+
com_assignments=None,
1515
parallelizer_list=None,
1616
cmd_related_properties=None,
1717
):
18-
# TODO []: default
18+
com_redirs = [] if com_redirs is None else com_redirs
19+
com_assignments = [] if com_assignments is None else com_assignments
1920
super().__init__(
2021
cmd_invocation_with_io_vars,
2122
com_redirs=com_redirs,

compiler/definitions/ir/nodes/r_wrap.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@ class RWrap(DFGNode):
1515
def __init__(
1616
self,
1717
cmd_invocation_with_io_vars,
18-
com_redirs=[],
19-
com_assignments=[],
18+
com_redirs=None,
19+
com_assignments=None,
2020
parallelizer_list=None,
2121
cmd_related_properties=None,
2222
wrapped_node_name=None,
2323
):
24-
# TODO []: default
24+
com_redirs = [] if com_redirs is None else com_redirs
25+
com_assignments = [] if com_assignments is None else com_assignments
2526
self.wrapped_node_name = wrapped_node_name
2627
super().__init__(
2728
cmd_invocation_with_io_vars,

compiler/definitions/ir/nodes/remote_pipe.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ def __init__(
88
outputs,
99
com_name,
1010
com_category,
11-
com_options=[],
12-
com_redirs=[],
13-
com_assignments=[],
11+
com_options=None,
12+
com_redirs=None,
13+
com_assignments=None,
1414
):
15+
com_options = [] if com_options is None else com_options
16+
com_redirs = [] if com_redirs is None else com_redirs
17+
com_assignments = [] if com_assignments is None else com_assignments
18+
1519
super().__init__(
1620
inputs,
1721
outputs,

compiler/dspash/worker_manager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ def host(self):
8989

9090

9191
class WorkersManager:
92-
def __init__(self, workers: WorkerConnection = []):
93-
self.workers = workers
92+
def __init__(self, workers: WorkerConnection = None):
93+
self.workers = [] if workers is None else workers
9494
self.host = socket.gethostbyname(socket.gethostname())
9595
self.args = copy.copy(config.pash_args)
9696
# Required to create a correct multi sink graph

compiler/ir.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,8 @@ def add_var_for_descriptor(operand):
233233
return command_invocation_with_io_vars, dfg_edges
234234

235235

236-
def compile_command_to_DFG(fileIdGen, command, options, redirections=[]):
236+
def compile_command_to_DFG(fileIdGen, command, options, redirections=None):
237+
redirections = [] if redirections is None else redirections
237238
command_invocation: CommandInvocationInitial = parse_arg_list_to_command_invocation(
238239
command, options
239240
)

compiler/shell_ast/ast_util.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ def redir_file_to_stdin(arg):
117117
return make_kv("File", ["From", 0, arg])
118118

119119

120-
def make_background(body, redirections=[]):
120+
def make_background(body, redirections=None):
121+
redirections = [] if redirections is None else redirections
121122
lineno = 0
122123
node = make_kv("Background", [lineno, body, redirections])
123124
return node
@@ -128,13 +129,16 @@ def make_backquote(node):
128129
return node
129130

130131

131-
def make_subshell(body, redirections=[]):
132+
def make_subshell(body, redirections=None):
133+
redirections = [] if redirections is None else redirections
132134
lineno = 0
133135
node = make_kv("Subshell", [lineno, body, redirections])
134136
return node
135137

136138

137-
def make_command(arguments, redirections=[], assignments=[]):
139+
def make_command(arguments, redirections=None, assignments=None):
140+
redirections = [] if redirections is None else redirections
141+
assignments = [] if assignments is None else assignments
138142
lineno = 0
139143
node = make_kv("Command", [lineno, assignments, arguments, redirections])
140144
return node

0 commit comments

Comments
 (0)