Skip to content

Commit 31428ca

Browse files
avdudchenkoavdudchenko
committed
added black formatting (orignally was not black formatted
1 parent 53ccca9 commit 31428ca

File tree

2 files changed

+75
-75
lines changed

2 files changed

+75
-75
lines changed

‎pyomo/common/formatting.py‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,20 @@ def tostr(value, quote_str=False):
8282

8383
tostr.handlers = {
8484
list: lambda value, quote_str: (
85-
"[%s]" % (', '.join(tostr(v, True) for v in value))
85+
"[%s]" % (", ".join(tostr(v, True) for v in value))
8686
),
8787
dict: lambda value, quote_str: (
8888
"{%s}"
8989
% (
90-
', '.join(
91-
'%s: %s' % (tostr(k, True), tostr(v, True)) for k, v in value.items()
90+
", ".join(
91+
"%s: %s" % (tostr(k, True), tostr(v, True)) for k, v in value.items()
9292
)
9393
)
9494
),
9595
tuple: lambda value, quote_str: (
9696
"(%s,)" % (tostr(value[0], True),)
9797
if len(value) == 1
98-
else "(%s)" % (', '.join(tostr(v, True) for v in value))
98+
else "(%s)" % (", ".join(tostr(v, True) for v in value))
9999
),
100100
str: lambda value, quote_str: (repr(value) if quote_str else value),
101101
None: lambda value, quote_str: str(value),
@@ -130,7 +130,7 @@ def tabular_writer(ostream, prefix, data, header, row_generator, sort_rows=True)
130130
_rows = {}
131131
# NB: _width is a list because we will change these values
132132
if header:
133-
header = (u"Key",) + tuple(tostr(x) for x in header)
133+
header = ("Key",) + tuple(tostr(x) for x in header)
134134
_width = [len(x) for x in header]
135135
else:
136136
_width = None
@@ -185,12 +185,12 @@ def tabular_writer(ostream, prefix, data, header, row_generator, sort_rows=True)
185185
# in the data (probably an expression or vector)
186186
_width = ["%" + str(i) + "s" for i in _width]
187187

188-
if any(' ' in r[-1] for x in _rows.values() if x is not None for r in x):
189-
_width[-1] = '%s'
188+
if any(" " in r[-1] for x in _rows.values() if x is not None for r in x):
189+
_width[-1] = "%s"
190190
if sort_rows:
191-
_sorted_rows=sorted_robust(_rows)
191+
_sorted_rows = sorted_robust(_rows)
192192
else:
193-
_sorted_rows=_rows
193+
_sorted_rows = _rows
194194
for _key in _sorted_rows:
195195
_rowSet = _rows[_key]
196196
if not _rowSet:
@@ -209,7 +209,7 @@ class StreamIndenter(object):
209209
StreamIndenter objects may be arbitrarily nested.
210210
"""
211211

212-
def __init__(self, ostream, indent=' ' * 4):
212+
def __init__(self, ostream, indent=" " * 4):
213213
self.os = ostream
214214
self.indent = indent
215215
self.stripped_indent = indent.rstrip()
@@ -221,7 +221,7 @@ def __getattr__(self, name):
221221
def write(self, data):
222222
if not len(data):
223223
return
224-
lines = data.split('\n')
224+
lines = data.split("\n")
225225
if self.newline:
226226
if lines[0]:
227227
self.os.write(self.indent + lines[0])
@@ -249,26 +249,26 @@ def writelines(self, sequence):
249249
self.write(x)
250250

251251

252-
_indentation_re = re.compile(r'\s*')
252+
_indentation_re = re.compile(r"\s*")
253253
_bullet_re = re.compile(
254-
r'([-+*] +)' # bulleted lists
255-
r'|(\(?[0-9]+[\)\.] +)' # enumerated lists (arabic numerals)
256-
r'|(\(?[ivxlcdm]+[\)\.] +)' # enumerated lists (roman numerals)
257-
r'|(\(?[IVXLCDM]+[\)\.] +)' # enumerated lists (roman numerals)
258-
r'|(\(?[a-zA-Z][\)\.] +)' # enumerated lists (letters)
259-
r'|(\(?\#[\)\.] +)' # auto enumerated lists
260-
r'|([a-zA-Z0-9_ ]+ +: +)' # definitions
261-
r'|(:[a-zA-Z0-9_ ]+: +)' # field name
262-
r'|(?:\[\s*[A-Za-z0-9\.]+\s*\] +)' # [PASS]|[FAIL]|[ OK ]
254+
r"([-+*] +)" # bulleted lists
255+
r"|(\(?[0-9]+[\)\.] +)" # enumerated lists (arabic numerals)
256+
r"|(\(?[ivxlcdm]+[\)\.] +)" # enumerated lists (roman numerals)
257+
r"|(\(?[IVXLCDM]+[\)\.] +)" # enumerated lists (roman numerals)
258+
r"|(\(?[a-zA-Z][\)\.] +)" # enumerated lists (letters)
259+
r"|(\(?\#[\)\.] +)" # auto enumerated lists
260+
r"|([a-zA-Z0-9_ ]+ +: +)" # definitions
261+
r"|(:[a-zA-Z0-9_ ]+: +)" # field name
262+
r"|(?:\[\s*[A-Za-z0-9\.]+\s*\] +)" # [PASS]|[FAIL]|[ OK ]
263263
)
264264
_verbatim_line_start = re.compile(
265-
r'(\| )' # line blocks
266-
r'|(\+((-{3,})|(={3,}))\+)' # grid table
265+
r"(\| )" # line blocks
266+
r"|(\+((-{3,})|(={3,}))\+)" # grid table
267267
)
268268
_verbatim_line = re.compile(
269-
r'(={3,}[ =]+)' # simple tables, ======== sections
269+
r"(={3,}[ =]+)" # simple tables, ======== sections
270270
# sections
271-
+ ''.join(r'|(\%s{3,})' % c for c in r'!"#$%&\'()*+,-./:;<>?@[\\]^_`{|}~')
271+
+ "".join(r"|(\%s{3,})" % c for c in r'!"#$%&\'()*+,-./:;<>?@[\\]^_`{|}~')
272272
)
273273

274274

@@ -305,7 +305,7 @@ def wrap_reStructuredText(docstr, wrapper):
305305
if literal_block:
306306
if literal_block[0] == 2:
307307
literal_block = False
308-
elif paragraphs[-1][2] and ''.join(paragraphs[-1][2]).endswith('::'):
308+
elif paragraphs[-1][2] and "".join(paragraphs[-1][2]).endswith("::"):
309309
literal_block = (0, paragraphs[-1][1])
310310
paragraphs.append((None, None, None))
311311
continue
@@ -318,7 +318,7 @@ def wrap_reStructuredText(docstr, wrapper):
318318
continue
319319
elif (
320320
len(literal_block[1]) == len(leading)
321-
and content[0] in '!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~'
321+
and content[0] in "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"
322322
):
323323
# quoted literal block
324324
literal_block = 2, leading
@@ -333,7 +333,7 @@ def wrap_reStructuredText(docstr, wrapper):
333333
else:
334334
# fall back on normal line processing
335335
literal_block = False
336-
if content == '```':
336+
if content == "```":
337337
# Not part of ReST, but we have supported this in Pyomo for a long time
338338
verbatim ^= True
339339
elif verbatim:
@@ -353,7 +353,7 @@ def wrap_reStructuredText(docstr, wrapper):
353353
if matchBullet:
354354
# Handle things that look like bullet lists specially
355355
hang = matchBullet.group()
356-
paragraphs.append((leading, leading + ' ' * len(hang), [content]))
356+
paragraphs.append((leading, leading + " " * len(hang), [content]))
357357
elif paragraphs[-1][1] == leading:
358358
# Continuing a text block
359359
paragraphs[-1][2].append(content)
@@ -371,16 +371,16 @@ def wrap_reStructuredText(docstr, wrapper):
371371

372372
if indent is None:
373373
if par is None:
374-
paragraphs[i] = ''
374+
paragraphs[i] = ""
375375
else:
376376
paragraphs[i] = base_indent + par
377377
continue
378378

379379
wrapper.initial_indent = base_indent + indent
380380
wrapper.subsequent_indent = base_indent + subseq
381-
paragraphs[i] = wrapper.fill(' '.join(par))
381+
paragraphs[i] = wrapper.fill(" ".join(par))
382382
finally:
383383
# Avoid side-effects and restore the initial wrapper state
384384
wrapper.initial_indent, wrapper.subsequent_indent = wrapper_init
385385

386-
return '\n'.join(paragraphs)
386+
return "\n".join(paragraphs)

‎pyomo/common/tests/test_formatting.py‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -33,36 +33,36 @@ class DerivedStr(str):
3333
pass
3434

3535

36-
NamedTuple = namedtuple('NamedTuple', ['x', 'y'])
36+
NamedTuple = namedtuple("NamedTuple", ["x", "y"])
3737

3838

3939
class TestToStr(unittest.TestCase):
4040
def test_new_type_float(self):
41-
self.assertEqual(tostr(0.5), '0.5')
41+
self.assertEqual(tostr(0.5), "0.5")
4242
self.assertIs(tostr.handlers[float], tostr.handlers[None])
4343

4444
def test_new_type_int(self):
45-
self.assertEqual(tostr(0), '0')
45+
self.assertEqual(tostr(0), "0")
4646
self.assertIs(tostr.handlers[int], tostr.handlers[None])
4747

4848
def test_new_type_str(self):
49-
self.assertEqual(tostr(DerivedStr(1)), '1')
49+
self.assertEqual(tostr(DerivedStr(1)), "1")
5050
self.assertIs(tostr.handlers[DerivedStr], tostr.handlers[str])
5151

5252
def test_new_type_list(self):
53-
self.assertEqual(tostr(DerivedList([1, 2])), '[1, 2]')
53+
self.assertEqual(tostr(DerivedList([1, 2])), "[1, 2]")
5454
self.assertIs(tostr.handlers[DerivedList], tostr.handlers[list])
5555

5656
def test_new_type_dict(self):
57-
self.assertEqual(tostr(DerivedDict({1: 2})), '{1: 2}')
57+
self.assertEqual(tostr(DerivedDict({1: 2})), "{1: 2}")
5858
self.assertIs(tostr.handlers[DerivedDict], tostr.handlers[dict])
5959

6060
def test_new_type_tuple(self):
61-
self.assertEqual(tostr(DerivedTuple([1, 2])), '(1, 2)')
61+
self.assertEqual(tostr(DerivedTuple([1, 2])), "(1, 2)")
6262
self.assertIs(tostr.handlers[DerivedTuple], tostr.handlers[tuple])
6363

6464
def test_new_type_namedtuple(self):
65-
self.assertEqual(tostr(NamedTuple(1, 2)), 'NamedTuple(x=1, y=2)')
65+
self.assertEqual(tostr(NamedTuple(1, 2)), "NamedTuple(x=1, y=2)")
6666
self.assertIs(tostr.handlers[NamedTuple], tostr.handlers[None])
6767

6868

@@ -73,7 +73,7 @@ def test_unicode_table(self):
7373
os = StringIO()
7474
data = {1: ("a", 1), (2, 3): ("∧", 2)}
7575
tabular_writer(os, "", data.items(), ["s", "val"], lambda k, v: v)
76-
ref = u"""
76+
ref = """
7777
Key : s : val
7878
1 : a : 1
7979
(2, 3) : ∧ : 2
@@ -82,9 +82,9 @@ def test_unicode_table(self):
8282

8383
def test_tuple_list_dict(self):
8484
os = StringIO()
85-
data = {(1,): (["a", 1], 1), ('2', 3): ({1: 'a', 2: '2'}, '2')}
85+
data = {(1,): (["a", 1], 1), ("2", 3): ({1: "a", 2: "2"}, "2")}
8686
tabular_writer(os, "", data.items(), ["s", "val"], lambda k, v: v)
87-
ref = u"""
87+
ref = """
8888
Key : s : val
8989
(1,) : ['a', 1] : 1
9090
('2', 3) : {1: 'a', 2: '2'} : 2
@@ -93,9 +93,9 @@ def test_tuple_list_dict(self):
9393

9494
def test_no_header(self):
9595
os = StringIO()
96-
data = {(2,): (["a", 1], 1), (1, 3): ({1: 'a', 2: '2'}, '2')}
96+
data = {(2,): (["a", 1], 1), (1, 3): ({1: "a", 2: "2"}, "2")}
9797
tabular_writer(os, "", data.items(), [], lambda k, v: v)
98-
ref = u"""
98+
ref = """
9999
{1: 'a', 2: '2'} : 2
100100
['a', 1] : 1
101101
"""
@@ -104,22 +104,22 @@ def test_no_header(self):
104104
def test_no_data(self):
105105
os = StringIO()
106106
data = {}
107-
tabular_writer(os, "", data.items(), ['s', 'val'], lambda k, v: v)
108-
ref = u"""
107+
tabular_writer(os, "", data.items(), ["s", "val"], lambda k, v: v)
108+
ref = """
109109
Key : s : val
110110
"""
111111
self.assertEqual(ref.strip(), os.getvalue().strip())
112112

113113
def test_multiline_generator(self):
114114
os = StringIO()
115-
data = {'a': 0, 'b': 1, 'c': 3}
115+
data = {"a": 0, "b": 1, "c": 3}
116116

117117
def _data_gen(i, j):
118118
for n in range(j):
119-
yield (n, chr(ord('a') + n) * j)
119+
yield (n, chr(ord("a") + n) * j)
120120

121-
tabular_writer(os, "", data.items(), ['i', 'j'], _data_gen)
122-
ref = u"""
121+
tabular_writer(os, "", data.items(), ["i", "j"], _data_gen)
122+
ref = """
123123
Key : i : j
124124
a : None : None
125125
b : 0 : a
@@ -150,16 +150,16 @@ def _data_gen(i, j):
150150

151151
def test_multiline_generator_exception(self):
152152
os = StringIO()
153-
data = {'a': 0, 'b': 1, 'c': 3}
153+
data = {"a": 0, "b": 1, "c": 3}
154154

155155
def _data_gen(i, j):
156-
if i == 'b':
156+
if i == "b":
157157
raise ValueError("invalid")
158158
for n in range(j):
159-
yield (n, chr(ord('a') + n) * j)
159+
yield (n, chr(ord("a") + n) * j)
160160

161-
tabular_writer(os, "", data.items(), ['i', 'j'], _data_gen)
162-
ref = u"""
161+
tabular_writer(os, "", data.items(), ["i", "j"], _data_gen)
162+
ref = """
163163
Key : i : j
164164
a : None : None
165165
b : None : None
@@ -171,15 +171,15 @@ def _data_gen(i, j):
171171

172172
def test_data_exception(self):
173173
os = StringIO()
174-
data = {'a': 0, 'b': 1, 'c': 3}
174+
data = {"a": 0, "b": 1, "c": 3}
175175

176176
def _data_gen(i, j):
177-
if i == 'b':
177+
if i == "b":
178178
raise ValueError("invalid")
179179
return (j, i * (j + 1))
180180

181-
tabular_writer(os, "", data.items(), ['i', 'j'], _data_gen)
182-
ref = u"""
181+
tabular_writer(os, "", data.items(), ["i", "j"], _data_gen)
182+
ref = """
183183
Key : i : j
184184
a : 0 : a
185185
b : None : None
@@ -189,19 +189,19 @@ def _data_gen(i, j):
189189

190190
def test_multiline_alignment(self):
191191
os = StringIO()
192-
data = {'a': 1, 'b': 2, 'c': 3}
192+
data = {"a": 1, "b": 2, "c": 3}
193193

194194
def _data_gen(i, j):
195195
for n in range(j):
196-
_str = chr(ord('a') + n) * (j + 1)
196+
_str = chr(ord("a") + n) * (j + 1)
197197
if n % 2:
198198
_str = list(_str)
199-
_str[1] = ' '
200-
_str = ''.join(_str)
199+
_str[1] = " "
200+
_str = "".join(_str)
201201
yield (n, _str)
202202

203-
tabular_writer(os, "", data.items(), ['i', 'j'], _data_gen)
204-
ref = u"""
203+
tabular_writer(os, "", data.items(), ["i", "j"], _data_gen)
204+
ref = """
205205
Key : i : j
206206
a : 0 : aa
207207
b : 0 : aaa
@@ -217,24 +217,24 @@ class TestStreamIndenter(unittest.TestCase):
217217
def test_noprefix(self):
218218
OUT1 = StringIO()
219219
OUT2 = StreamIndenter(OUT1)
220-
OUT2.write('Hello?\nHello, world!')
221-
self.assertEqual(' Hello?\n Hello, world!', OUT2.getvalue())
220+
OUT2.write("Hello?\nHello, world!")
221+
self.assertEqual(" Hello?\n Hello, world!", OUT2.getvalue())
222222

223223
def test_prefix(self):
224-
prefix = 'foo:'
224+
prefix = "foo:"
225225
OUT1 = StringIO()
226226
OUT2 = StreamIndenter(OUT1, prefix)
227-
OUT2.write('Hello?\nHello, world!')
228-
self.assertEqual('foo:Hello?\nfoo:Hello, world!', OUT2.getvalue())
227+
OUT2.write("Hello?\nHello, world!")
228+
self.assertEqual("foo:Hello?\nfoo:Hello, world!", OUT2.getvalue())
229229

230230
def test_blank_lines(self):
231231
OUT1 = StringIO()
232232
OUT2 = StreamIndenter(OUT1)
233-
OUT2.write('Hello?\n\nText\n\nHello, world!')
234-
self.assertEqual(' Hello?\n\n Text\n\n Hello, world!', OUT2.getvalue())
233+
OUT2.write("Hello?\n\nText\n\nHello, world!")
234+
self.assertEqual(" Hello?\n\n Text\n\n Hello, world!", OUT2.getvalue())
235235

236236
def test_writelines(self):
237237
OUT1 = StringIO()
238238
OUT2 = StreamIndenter(OUT1)
239-
OUT2.writelines(['Hello?\n', '\n', 'Text\n', '\n', 'Hello, world!'])
240-
self.assertEqual(' Hello?\n\n Text\n\n Hello, world!', OUT2.getvalue())
239+
OUT2.writelines(["Hello?\n", "\n", "Text\n", "\n", "Hello, world!"])
240+
self.assertEqual(" Hello?\n\n Text\n\n Hello, world!", OUT2.getvalue())

0 commit comments

Comments
 (0)