Skip to content

Commit

Permalink
Merge pull request #177 from minrk/string-types
Browse files Browse the repository at this point in the history
handle _template_path being unicode on py2
  • Loading branch information
Carreau committed Jul 1, 2015
2 parents 8336768 + b122b52 commit 92b9699
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion notebook/notebookapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def init_settings(self, ipython_app, kernel_manager, contents_manager,
"template_path",
ipython_app.template_file_path,
)
if isinstance(_template_path, str):
if isinstance(_template_path, py3compat.string_types):
_template_path = (_template_path,)
template_path = [os.path.expanduser(path) for path in _template_path]

Expand Down

0 comments on commit 92b9699

Please sign in to comment.