Skip to content

Commit

Permalink
remove f-strings for 3.5 🤦
Browse files Browse the repository at this point in the history
  • Loading branch information
Zsailer committed Dec 18, 2019
1 parent a4f801a commit 1259931
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
20 changes: 10 additions & 10 deletions jupyter_server/extension/serverextension.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ def validate_server_extension(import_name):
return mod, func, version
# If the extension does not exist, raise an exception
except ModuleNotFoundError:
raise ExtensionValidationError(f'{import_name} is not importable.')
raise ExtensionValidationError('{} is not importable.'.format(import_name))
# If the extension does not have a `load_jupyter_server_extension` function, raise exception.
except AttributeError:
raise ExtensionValidationError(f'Found module "{import_name}" but cannot load it.')
raise ExtensionValidationError('Found module "{}" but cannot load it.'.format(import_name))


def toggle_server_extension_python(import_name, enabled=None, parent=None, user=False, sys_prefix=True):
Expand Down Expand Up @@ -207,9 +207,9 @@ def toggle_server_extension(self, import_name):
`load_jupyter_server_extension` function
"""
try:
self.log.info(f"{self._toggle_pre_message.capitalize()}: {import_name}")
self.log.info("{}: {}".format(self._toggle_pre_message.capitalize(), import_name))
# Validate the server extension.
self.log.info(f" - Validating {import_name}...")
self.log.info(" - Validating {}...".format(import_name))
_, __, version = validate_server_extension(import_name)

# Toggle the server extension to active.
Expand All @@ -220,12 +220,12 @@ def toggle_server_extension(self, import_name):
user=self.user,
sys_prefix=self.sys_prefix
)
self.log.info(f" {import_name} {version} {GREEN_OK}")
self.log.info(" {} {} {}".format(import_item, version, GREEN_OK))

# If successful, let's log.
self.log.info(f" - Extension successfully {self._toggle_post_message}.")
self.log.info(" - Extension successfully {}.".format(self._toggle_post_message))
except ExtensionValidationError as err:
self.log.info(f" {RED_X} Validation failed: {err}")
self.log.info(" {} Validation failed: {}".format(RED_X, err))

def toggle_server_extension_python(self, package):
"""Change the status of some server extensions in a Python package.
Expand Down Expand Up @@ -309,12 +309,12 @@ def list_server_extensions(self):
import_name,
GREEN_ENABLED if enabled else RED_DISABLED))
try:
self.log.info(f" - Validating {import_name}...")
self.log.info(" - Validating {}...".format(import_name))
_, __, version = validate_server_extension(import_name)
self.log.info(f" {import_name} {version} {GREEN_OK}")
self.log.info(" {} {} {}".format(import_name, version, GREEN_OK))

except ExtensionValidationError as err:
self.log.warn(f" {RED_X} {err}")
self.log.warn(" {} {}".format(RED_X, err))

def start(self):
"""Perform the App's actions as configured"""
Expand Down
4 changes: 2 additions & 2 deletions tests/extension/test_entrypoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def test_server_extension_enable(environ, inject_mock_extension, script_runner):
extension_name = 'mockextension'
ret = script_runner.run('jupyter', 'server', 'extension', 'enable', extension_name)
assert ret.success
assert f'Enabling: {extension_name}' in ret.stderr
assert 'Enabling: {}'.format(extension_name) in ret.stderr


def test_server_extension_disable(environ, script_runner):
Expand All @@ -28,4 +28,4 @@ def test_server_extension_disable(environ, script_runner):
extension_name = 'mockextension'
ret = script_runner.run('jupyter', 'server', 'extension', 'disable', extension_name)
assert ret.success
assert f'Disabling: {extension_name}' in ret.stderr
assert 'Disabling: {}'.format(extension_name) in ret.stderr

0 comments on commit 1259931

Please sign in to comment.