Skip to content

Commit

Permalink
chore(misc): remove indices from format placeholders
Browse files Browse the repository at this point in the history 
This cuts support for Python 2.6
  • Loading branch information
@theY4Kman
theY4Kman committed Apr 6, 2019
1 parent 3603c57 commit 95d848f
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 48 deletions.
2 changes: 1 addition & 1 deletion examples/loader_spin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
try:
spinner.start()
for i in range(100):
spinner.text = '{0}% Downloaded dataset.zip'.format(i)
spinner.text = '{}% Downloaded dataset.zip'.format(i)
time.sleep(random.random())
spinner.succeed('Downloaded dataset.zip')
except (KeyboardInterrupt, SystemExit):
Expand Down
2 changes: 1 addition & 1 deletion examples/notebook.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"try:\n",
" spinner.start()\n",
" for i in range(100):\n",
" spinner.text = '{0}% Downloaded dataset.zip'.format(i)\n",
" spinner.text = '{}% Downloaded dataset.zip'.format(i)\n",
" time.sleep(0.05)\n",
" spinner.succeed('Downloaded dataset.zip')\n",
"except (KeyboardInterrupt, SystemExit):\n",
Expand Down
4 changes: 2 additions & 2 deletions halo/halo_notebook.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def clear(self):

def _render_frame(self):
frame = self.frame()
output = '\r{0}'.format(frame)
output = '\r{}'.format(frame)
with self.output:
self.output.outputs += self._output(output)

Expand Down Expand Up @@ -100,7 +100,7 @@ def stop_and_persist(self, symbol=' ', text=None):

self.stop()

output = '\r{0} {1}\n'.format(*[
output = '\r{} {}\n'.format(*[
(text, symbol)
if self._placement == 'right' else
(symbol, text)
Expand Down
45 changes: 22 additions & 23 deletions tests/test_halo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ def test_basic_spinner(self):
spinner.stop()
output = self._get_test_output()['text']

self.assertEqual(output[0], '{0} foo'.format(frames[0]))
self.assertEqual(output[1], '{0} foo'.format(frames[1]))
self.assertEqual(output[2], '{0} foo'.format(frames[2]))
self.assertEqual(output[0], '{} foo'.format(frames[0]))
self.assertEqual(output[1], '{} foo'.format(frames[1]))
self.assertEqual(output[2], '{} foo'.format(frames[2]))

def test_text_spinner_color(self):
"""Test basic spinner with available colors color (both spinner and text)
Expand Down Expand Up @@ -152,9 +152,9 @@ def test_text_stripping(self):
spinner.succeed('foo\n')
output = self._get_test_output()['text']

self.assertEqual(output[0], '{0} foo'.format(frames[0]))
self.assertEqual(output[1], '{0} foo'.format(frames[1]))
self.assertEqual(output[2], '{0} foo'.format(frames[2]))
self.assertEqual(output[0], '{} foo'.format(frames[0]))
self.assertEqual(output[1], '{} foo'.format(frames[1]))
self.assertEqual(output[2], '{} foo'.format(frames[2]))

pattern = re.compile(r'(✔|v) foo', re.UNICODE)

Expand All @@ -176,9 +176,9 @@ def test_text_ellipsing(self):
terminal_width = get_terminal_columns()

# -6 of the ' (...)' ellipsis, -2 of the spinner and space
self.assertEqual(output[0], '{0} {1} (...)'.format(frames[0], text[:terminal_width - 6 - 2]))
self.assertEqual(output[1], '{0} {1} (...)'.format(frames[1], text[:terminal_width - 6 - 2]))
self.assertEqual(output[2], '{0} {1} (...)'.format(frames[2], text[:terminal_width - 6 - 2]))
self.assertEqual(output[0], '{} {} (...)'.format(frames[0], text[:terminal_width - 6 - 2]))
self.assertEqual(output[1], '{} {} (...)'.format(frames[1], text[:terminal_width - 6 - 2]))
self.assertEqual(output[2], '{} {} (...)'.format(frames[2], text[:terminal_width - 6 - 2]))

pattern = re.compile(r'(✔|v) End!', re.UNICODE)

Expand All @@ -199,9 +199,9 @@ def test_text_animation(self):

terminal_width = get_terminal_columns()

self.assertEqual(output[0], '{0} {1}'.format(frames[0], text[:terminal_width - 2]))
self.assertEqual(output[1], '{0} {1}'.format(frames[1], text[1:terminal_width - 1]))
self.assertEqual(output[2], '{0} {1}'.format(frames[2], text[2:terminal_width]))
self.assertEqual(output[0], '{} {}'.format(frames[0], text[:terminal_width - 2]))
self.assertEqual(output[1], '{} {}'.format(frames[1], text[1:terminal_width - 1]))
self.assertEqual(output[2], '{} {}'.format(frames[2], text[2:terminal_width]))

pattern = re.compile(r'(✔|v) End!', re.UNICODE)

Expand All @@ -214,9 +214,9 @@ def test_context_manager(self):
time.sleep(1)
output = self._get_test_output()['text']

self.assertEqual(output[0], '{0} foo'.format(frames[0]))
self.assertEqual(output[1], '{0} foo'.format(frames[1]))
self.assertEqual(output[2], '{0} foo'.format(frames[2]))
self.assertEqual(output[0], '{} foo'.format(frames[0]))
self.assertEqual(output[1], '{} foo'.format(frames[1]))
self.assertEqual(output[2], '{} foo'.format(frames[2]))

def test_context_manager_exceptions(self):
"""Test Halo context manager allows exceptions to bubble up
Expand All @@ -234,10 +234,9 @@ def decorated_function():

decorated_function()
output = self._get_test_output()['text']

self.assertEqual(output[0], '{0} foo'.format(frames[0]))
self.assertEqual(output[1], '{0} foo'.format(frames[1]))
self.assertEqual(output[2], '{0} foo'.format(frames[2]))
self.assertEqual(output[0], '{} foo'.format(frames[0]))
self.assertEqual(output[1], '{} foo'.format(frames[1]))
self.assertEqual(output[2], '{} foo'.format(frames[2]))

def test_decorator_exceptions(self):
"""Test Halo decorator allows exceptions to bubble up"""
Expand All @@ -259,9 +258,9 @@ def test_initial_title_spinner(self):
spinner.stop()
output = self._get_test_output()['text']

self.assertEqual(output[0], '{0} bar'.format(frames[0]))
self.assertEqual(output[1], '{0} bar'.format(frames[1]))
self.assertEqual(output[2], '{0} bar'.format(frames[2]))
self.assertEqual(output[0], '{} bar'.format(frames[0]))
self.assertEqual(output[1], '{} bar'.format(frames[1]))
self.assertEqual(output[2], '{} bar'.format(frames[2]))

def test_id_not_created_before_start(self):
"""Test Spinner ID not created before start.
Expand Down Expand Up @@ -547,7 +546,7 @@ def filler_text(n_chars):
]
# Prepend the actual spinner
expected_frames = [
"{0} {1}".format(frames[idx % frames.__len__()], frame)
"{} {}".format(frames[idx % frames.__len__()], frame)
for idx, frame in enumerate(expected_frames_without_appended_spinner)
]
spinner = Halo(text, animation="bounce", stream=self._stream)
Expand Down
42 changes: 21 additions & 21 deletions tests/test_halo_notebook.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ def test_basic_spinner(self):
output = self._get_test_output(spinner)['text']
spinner.stop()

self.assertEqual(output[0], '{0} foo'.format(frames[0]))
self.assertEqual(output[1], '{0} foo'.format(frames[1]))
self.assertEqual(output[2], '{0} foo'.format(frames[2]))
self.assertEqual(output[0], '{} foo'.format(frames[0]))
self.assertEqual(output[1], '{} foo'.format(frames[1]))
self.assertEqual(output[2], '{} foo'.format(frames[2]))
self.assertEqual(spinner.output.outputs, spinner._output(''))

def test_text_spinner_color(self):
Expand Down Expand Up @@ -114,9 +114,9 @@ def test_text_stripping(self):
time.sleep(1)
output = self._get_test_output(spinner)['text']

self.assertEqual(output[0], '{0} foo'.format(frames[0]))
self.assertEqual(output[1], '{0} foo'.format(frames[1]))
self.assertEqual(output[2], '{0} foo'.format(frames[2]))
self.assertEqual(output[0], '{} foo'.format(frames[0]))
self.assertEqual(output[1], '{} foo'.format(frames[1]))
self.assertEqual(output[2], '{} foo'.format(frames[2]))

spinner.succeed('foo\n')
output = self._get_test_output(spinner)['text']
Expand All @@ -140,9 +140,9 @@ def test_text_ellipsing(self):
terminal_width = get_terminal_columns()

# -6 of the ' (...)' ellipsis, -2 of the spinner and space
self.assertEqual(output[0], '{0} {1} (...)'.format(frames[0], text[:terminal_width - 6 - 2]))
self.assertEqual(output[1], '{0} {1} (...)'.format(frames[1], text[:terminal_width - 6 - 2]))
self.assertEqual(output[2], '{0} {1} (...)'.format(frames[2], text[:terminal_width - 6 - 2]))
self.assertEqual(output[0], '{} {} (...)'.format(frames[0], text[:terminal_width - 6 - 2]))
self.assertEqual(output[1], '{} {} (...)'.format(frames[1], text[:terminal_width - 6 - 2]))
self.assertEqual(output[2], '{} {} (...)'.format(frames[2], text[:terminal_width - 6 - 2]))

spinner.succeed('End!')
output = self._get_test_output(spinner)['text']
Expand All @@ -165,9 +165,9 @@ def test_text_animation(self):

terminal_width = get_terminal_columns()

self.assertEqual(output[0], '{0} {1}'.format(frames[0], text[:terminal_width - 2]))
self.assertEqual(output[1], '{0} {1}'.format(frames[1], text[1:terminal_width - 1]))
self.assertEqual(output[2], '{0} {1}'.format(frames[2], text[2:terminal_width]))
self.assertEqual(output[0], '{} {}'.format(frames[0], text[:terminal_width - 2]))
self.assertEqual(output[1], '{} {}'.format(frames[1], text[1:terminal_width - 1]))
self.assertEqual(output[2], '{} {}'.format(frames[2], text[2:terminal_width]))

spinner.succeed('End!')
output = self._get_test_output(spinner)['text']
Expand All @@ -183,9 +183,9 @@ def test_context_manager(self):
time.sleep(1)
output = self._get_test_output(spinner)['text']

self.assertEqual(output[0], '{0} foo'.format(frames[0]))
self.assertEqual(output[1], '{0} foo'.format(frames[1]))
self.assertEqual(output[2], '{0} foo'.format(frames[2]))
self.assertEqual(output[0], '{} foo'.format(frames[0]))
self.assertEqual(output[1], '{} foo'.format(frames[1]))
self.assertEqual(output[2], '{} foo'.format(frames[2]))
self.assertEqual(spinner.output.outputs, spinner._output(''))

def test_decorator_spinner(self):
Expand All @@ -201,9 +201,9 @@ def decorated_function():

output = decorated_function()

self.assertEqual(output[0], '{0} foo'.format(frames[0]))
self.assertEqual(output[1], '{0} foo'.format(frames[1]))
self.assertEqual(output[2], '{0} foo'.format(frames[2]))
self.assertEqual(output[0], '{} foo'.format(frames[0]))
self.assertEqual(output[1], '{} foo'.format(frames[1]))
self.assertEqual(output[2], '{} foo'.format(frames[2]))

def test_initial_title_spinner(self):
"""Test Halo with initial title.
Expand All @@ -215,9 +215,9 @@ def test_initial_title_spinner(self):
output = self._get_test_output(spinner)['text']
spinner.stop()

self.assertEqual(output[0], '{0} bar'.format(frames[0]))
self.assertEqual(output[1], '{0} bar'.format(frames[1]))
self.assertEqual(output[2], '{0} bar'.format(frames[2]))
self.assertEqual(output[0], '{} bar'.format(frames[0]))
self.assertEqual(output[1], '{} bar'.format(frames[1]))
self.assertEqual(output[2], '{} bar'.format(frames[2]))
self.assertEqual(spinner.output.outputs, spinner._output(''))

def test_id_not_created_before_start(self):
Expand Down

0 comments on commit 95d848f

Please sign in to comment.