Merge pull request #3316 from ehengao/master

takluyver · web-flow · commit 0db7ef7afe71 · 2018-02-08T11:24:02.000Z
add missing import _
diff --git a/notebook/services/contents/manager.py b/notebook/services/contents/manager.py
@@ -31,6 +31,7 @@
 )
 from ipython_genutils.py3compat import string_types
 from notebook.base.handlers import IPythonHandler
+from notebook.transutils import _
 
 
 copy_pat = re.compile(r'\-Copy\d*\.')

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`)`
`32`	`32`	`from ipython_genutils.py3compat import string_types`
`33`	`33`	`from notebook.base.handlers import IPythonHandler`
	`34`	`+from notebook.transutils import _`
`34`	`35`
`35`	`36`
`36`	`37`	`copy_pat = re.compile(r'\-Copy\d*\.')`