Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e00dd9a

Browse files
minrkminrk
committed
replace project_name with language_name
- automatically choose language match, if only one - only list language matches in select dialog - list all kernels if no language match
1 parent 0447b96 commit e00dd9a

3 files changed

Lines changed: 45 additions & 24 deletions

File tree

‎IPython/html/static/notebook/js/kernelselector.js‎

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ define([
2626
IPython.kernelselector = this;
2727
this._finish_load = null;
2828
this._loaded = false;
29-
this.loaded = new Promise(function(resolve, reject) {
29+
this.loaded = new Promise(function(resolve) {
3030
that._finish_load = resolve;
3131
});
3232

@@ -38,16 +38,12 @@ define([
3838
utils.promising_ajax(url).then($.proxy(this._got_kernelspecs, this));
3939
};
4040

41-
KernelSelector.prototype._got_kernelspecs = function(data) {
42-
var that = this;
43-
this.kernelspecs = data.kernelspecs;
44-
var change_kernel_submenu = $("#menu-change-kernel-submenu");
45-
var new_notebook_submenu = $("#menu-new-notebook-submenu");
46-
47-
var keys = Object.keys(data.kernelspecs).sort(function (a, b) {
41+
var _sorted_names = function(kernelspecs) {
42+
// sort kernel names
43+
return Object.keys(kernelspecs).sort(function (a, b) {
4844
// sort by display_name
49-
var da = data.kernelspecs[a].spec.display_name;
50-
var db = data.kernelspecs[b].spec.display_name;
45+
var da = kernelspecs[a].spec.display_name;
46+
var db = kernelspecs[b].spec.display_name;
5147
if (da === db) {
5248
return 0;
5349
} else if (da > db) {
@@ -56,6 +52,14 @@ define([
5652
return -1;
5753
}
5854
});
55+
};
56+
57+
KernelSelector.prototype._got_kernelspecs = function(data) {
58+
var that = this;
59+
this.kernelspecs = data.kernelspecs;
60+
var change_kernel_submenu = $("#menu-change-kernel-submenu");
61+
var new_notebook_submenu = $("#menu-new-notebook-submenu");
62+
var keys = _sorted_names(data.kernelspecs);
5963

6064
keys.map(function (key) {
6165
// Create the Kernel > Change kernel submenu
@@ -160,7 +164,7 @@ define([
160164
/** set the kernel by name, ensuring kernelspecs have been loaded, first
161165
162166
kernel can be just a kernel name, or a notebook kernelspec metadata
163-
(name, project_name, display_name).
167+
(name, language_name, display_name).
164168
*/
165169
var that = this;
166170
if (typeof selected === 'string') {
@@ -183,18 +187,28 @@ define([
183187
// only trigger event if value changed
184188
return;
185189
}
186-
var ks = this.kernelspecs[selected.name];
190+
var kernelspecs = this.kernelspecs;
191+
var ks = kernelspecs[selected.name];
187192
if (ks === undefined) {
188-
if (selected.project_name && selected.project_name.length > 0) {
189-
$.map(this.kernelspecs, function (k) {
190-
if (k.spec.project_name === selected.project_name) {
191-
ks = k;
193+
var available = _sorted_names(kernelspecs);
194+
var matches = [];
195+
if (selected.language_name && selected.language_name.length > 0) {
196+
$.map(available, function (name) {
197+
if (kernelspecs[name].spec.language_name.toLowerCase() === selected.language_name.toLowerCase()) {
198+
matches.push(name);
192199
}
193200
});
194201
}
202+
if (matches.length === 1) {
203+
ks = kernelspecs[matches[0]];
204+
}
195205
// if still undefined, trigger failure event
196206
if (ks === undefined) {
197-
this.events.trigger("spec_not_found.Kernel", selected);
207+
this.events.trigger("spec_not_found.Kernel", {
208+
selected: selected,
209+
matches: matches,
210+
available: available,
211+
});
198212
return;
199213
}
200214
}
@@ -210,15 +224,22 @@ define([
210224
var that = this;
211225
var select = $("<select>").addClass('form-control');
212226
console.warn("Kernelspec not found:", data);
213-
$.map(this.kernelspecs, function (ks) {
227+
var names;
228+
if (data.matches.length > 1) {
229+
names = data.matches;
230+
} else {
231+
names = data.available;
232+
}
233+
$.map(names, function (name) {
234+
var ks = that.kernelspecs[name];
214235
select.append(
215-
$('<option/>').attr('value', ks.name).text(ks.spec.display_name)
236+
$('<option/>').attr('value', ks.name).text(ks.spec.display_name || ks.name)
216237
);
217238
});
218239

219240
var body = $("<form>").addClass("form-inline").append(
220241
$("<span>").text(
221-
"I couldn't find a kernel matching " + (data.display_name || data.name) + "." +
242+
"I couldn't find a kernel matching " + (data.selected.display_name || data.name) + "." +
222243
" Please select a kernel:"
223244
)
224245
).append(select);

‎IPython/html/static/notebook/js/notebook.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ define([
249249
that.metadata.kernelspec = {
250250
name: data.name,
251251
display_name: data.spec.display_name,
252-
project_name: data.spec.project_name,
252+
language_name: data.spec.language_name,
253253
};
254254
// start session if the current session isn't already correct
255255
if (!(this.session && this.session.kernel && this.session.kernel.name === data.name)) {

‎IPython/kernel/kernelspec.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def _pythonfirst(s):
3636
class KernelSpec(HasTraits):
3737
argv = List()
3838
display_name = Unicode()
39-
project_name = Unicode()
39+
language_name = Unicode()
4040
env = Dict()
4141
resource_dir = Unicode()
4242

@@ -55,7 +55,7 @@ def to_dict(self):
5555
d = dict(argv=self.argv,
5656
env=self.env,
5757
display_name=self.display_name,
58-
project_name=self.project_name,
58+
language_name=self.language_name,
5959
)
6060

6161
return d
@@ -114,7 +114,7 @@ def _native_kernel_dict(self):
114114
return {
115115
'argv': make_ipkernel_cmd(),
116116
'display_name': 'Python %i' % (3 if PY3 else 2),
117-
'project_name': 'ipython',
117+
'language_name': 'python',
118118
}
119119

120120
@property

0 commit comments

Comments
 (0)