@@ -107,10 +107,7 @@ def __init__(self, f: IO[Any]):
107
107
self ._storages : dict [str , dict [str , str ]] = {}
108
108
109
109
def _parse_section (
110
- self ,
111
- section_type : str ,
112
- name : str ,
113
- options : dict [str , Any ]
110
+ self , section_type : str , name : str , options : dict [str , Any ]
114
111
) -> None :
115
112
validate_section_name (name , section_type )
116
113
if name in self ._seen_names :
@@ -129,7 +126,7 @@ def _parse_section(
129
126
raise ValueError ("Unknown section type." )
130
127
131
128
def parse (
132
- self
129
+ self ,
133
130
) -> tuple [dict [str , str ], dict [str , dict [str , str ]], dict [str , dict [str , str ]]]:
134
131
for section in self ._parser .sections ():
135
132
if " " in section :
@@ -157,8 +154,7 @@ def parse(
157
154
158
155
159
156
def _parse_options (
160
- items : list [tuple [str , str ]],
161
- section : str | None = None
157
+ items : list [tuple [str , str ]], section : str | None = None
162
158
) -> Generator [tuple [str , dict [str , str ]], None , None ]:
163
159
for key , value in items :
164
160
try :
@@ -172,7 +168,7 @@ def __init__(
172
168
self ,
173
169
general : dict [str , str ],
174
170
pairs : dict [str , dict [str , str ]],
175
- storages : dict [str , dict [str , str ]]
171
+ storages : dict [str , dict [str , str ]],
176
172
) -> None :
177
173
self .general = general
178
174
self .storages = storages
@@ -258,8 +254,7 @@ def __init__(self, full_config: Config, name: str, options: dict[str, str]):
258
254
raise ValueError ("Unknown options: {}" .format (", " .join (options )))
259
255
260
256
def _process_conflict_resolution_param (
261
- self ,
262
- conflict_resolution : str | list [str ] | None
257
+ self , conflict_resolution : str | list [str ] | None
263
258
):
264
259
if conflict_resolution in (None , "a wins" , "b wins" ):
265
260
return conflict_resolution
@@ -337,12 +332,7 @@ def __init__(self, pair, name: str, config_a, config_b):
337
332
338
333
339
334
def _resolve_conflict_via_command (
340
- a ,
341
- b ,
342
- command ,
343
- a_name ,
344
- b_name ,
345
- _check_call = None
335
+ a , b , command , a_name , b_name , _check_call = None
346
336
) -> Item :
347
337
import shutil
348
338
import tempfile
0 commit comments