Skip to content

Commit

Permalink
Update to use [email protected]
Browse files Browse the repository at this point in the history
  • Loading branch information
@n-riesco
n-riesco committed Jan 28, 2016
1 parent f9b3f7e commit d4f219f
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 97 deletions.
90 changes: 44 additions & 46 deletions lib/handlers_v4.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,15 @@ function execute_request(request) {
// Ensure stdin, stdout and stderr streams are sent to this request
this.lastExecuteRequest = request;

var task = {
action: "run",
code: request.content.code,
beforeRun: beforeRun.bind(this),
afterRun: afterRun.bind(this),
onSuccess: onSuccess.bind(this),
onError: onError.bind(this)
};
this.session.run(task);
this.session.execute(
request.content.code,
onSuccess.bind(this),
onError.bind(this),
beforeRun.bind(this),
afterRun.bind(this)
);

function beforeRun(session) {
function beforeRun() {
this.executionCount++;
request.respond(
this.iopubSocket,
Expand All @@ -109,9 +107,9 @@ function execute_request(request) {
);
}

function afterRun(session) {}
function afterRun() {}

function onSuccess(session) {
function onSuccess(result) {
request.respond(
this.shellSocket,
"execute_reply", {
Expand All @@ -124,39 +122,41 @@ function execute_request(request) {
);

if (this.hideUndefined &&
session.result.mime["text/plain"] === "undefined") {
result.mime["text/plain"] === "undefined") {
return;
}

request.respond(
this.iopubSocket,
"pyout", {
execution_count: this.executionCount,
data: session.result.mime,
data: result.mime,
metadata: {},
}
);
}

function onError(session) {
function onError(result) {
request.respond(
this.shellSocket,
"execute_reply", {
status: "error",
execution_count: this.executionCount,
ename: session.result.error.ename,
evalue: session.result.error.evalue,
traceback: session.result.error.traceback,
});
ename: result.error.ename,
evalue: result.error.evalue,
traceback: result.error.traceback,
}
);

request.respond(
this.iopubSocket,
"pyerr", {
execution_count: this.executionCount,
ename: session.result.error.ename,
evalue: session.result.error.evalue,
traceback: session.result.error.traceback,
});
ename: result.error.ename,
evalue: result.error.evalue,
traceback: result.error.traceback,
}
);
}
}

Expand All @@ -175,16 +175,16 @@ function complete_request(request) {
);
return;

function onSuccess(session) {
function onSuccess(result) {
var content = {
"matches": session.result.completion.list,
"matched_text": session.result.completion.matchedText,
"matches": result.completion.list,
"matched_text": result.completion.matchedText,
"status": "ok",
};
request.respond(this.shellSocket, "complete_reply", content);
}

function onError(session) {
function onError(result) {
var content = {
"matches": [],
"matched_text": request.content.text,
Expand All @@ -209,52 +209,50 @@ function object_info_request(request) {
);
return;

function onSuccess(session) {
function onSuccess(result) {
var content = {
oname: request.content.oname,
found: true,
ismagic: false,
isalias: false,
};

if (session.result.inspection) {
content.string_name = session.result.inspection.string;
if (result.inspection) {
content.string_name = result.inspection.string;

if (session.result.inspection.list) {
if (session.result.inspection.list.length >= 1) {
content.type_name = session.result.inspection.list[0];
if (result.inspection.list) {
if (result.inspection.list.length >= 1) {
content.type_name = result.inspection.list[0];
} else {
content.type_name = session.result.inspection.type;
content.type_name = result.inspection.type;
}

if (session.result.inspection.list.length >= 2) {
content.base_name = session.result.inspection.list[1];
if (result.inspection.list.length >= 2) {
content.base_name = result.inspection.list[1];
}
}

if (session.result.inspection.length) {
content.length = session.result.inspection.length;
if (result.inspection.length) {
content.length = result.inspection.length;
}

content.docstring = (
session.result.inspection.type +
": " +
session.result.inspection.string
result.inspection.type + ": " + result.inspection.string
);
}

if (session.result.doc) {
if (result.doc) {
content.namespace = "builtin";
content.docstring = session.result.doc.description;
if (session.result.doc.usage) {
content.definition = session.result.doc.usage;
content.docstring = result.doc.description;
if (result.doc.usage) {
content.definition = result.doc.usage;
}
}

request.respond(this.shellSocket, "object_info_reply", content);
}

function onError(session) {
function onError(result) {
var content = {
oname: request.content.oname,
found: false,
Expand Down
80 changes: 39 additions & 41 deletions lib/handlers_v5.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,15 @@ function execute_request(request) {
// Ensure stdin, stdout and stderr streams are sent to this request
this.lastExecuteRequest = request;

var task = {
action: "run",
code: request.content.code,
beforeRun: beforeRun.bind(this),
afterRun: afterRun.bind(this),
onSuccess: onSuccess.bind(this),
onError: onError.bind(this)
};
this.session.run(task);
this.session.execute(
request.content.code,
onSuccess.bind(this),
onError.bind(this),
beforeRun.bind(this),
afterRun.bind(this)
);

function beforeRun(session) {
function beforeRun() {
this.executionCount++;
request.respond(
this.iopubSocket,
Expand All @@ -130,9 +128,9 @@ function execute_request(request) {
);
}

function afterRun(session) {}
function afterRun() {}

function onSuccess(session) {
function onSuccess(result) {
request.respond(
this.shellSocket,
"execute_reply", {
Expand All @@ -144,39 +142,41 @@ function execute_request(request) {
);

if (this.hideUndefined &&
session.result.mime["text/plain"] === "undefined") {
result.mime["text/plain"] === "undefined") {
return;
}

request.respond(
this.iopubSocket,
"execute_result", {
execution_count: this.executionCount,
data: session.result.mime,
data: result.mime,
metadata: {},
}
);
}

function onError(session) {
function onError(result) {
request.respond(
this.shellSocket,
"execute_reply", {
status: "error",
execution_count: this.executionCount,
ename: session.result.error.ename,
evalue: session.result.error.evalue,
traceback: session.result.error.traceback,
});
ename: result.error.ename,
evalue: result.error.evalue,
traceback: result.error.traceback,
}
);

request.respond(
this.iopubSocket,
"error", {
execution_count: this.executionCount,
ename: session.result.error.ename,
evalue: session.result.error.evalue,
traceback: session.result.error.traceback,
});
ename: result.error.ename,
evalue: result.error.evalue,
traceback: result.error.traceback,
}
);
}
}

Expand All @@ -195,17 +195,17 @@ function complete_request(request) {
);
return;

function onSuccess(session) {
function onSuccess(result) {
var content = {
matches: session.result.completion.list,
cursor_start: session.result.completion.cursorStart,
cursor_end: session.result.completion.cursorEnd,
matches: result.completion.list,
cursor_start: result.completion.cursorStart,
cursor_end: result.completion.cursorEnd,
status: "ok",
};
request.respond(this.shellSocket, "complete_reply", content);
}

function onError(session) {
function onError(result) {
var content = {
matches: [],
cursor_start: request.content.cursor_pos,
Expand All @@ -231,21 +231,19 @@ function inspect_request(request) {
);
return;

function onSuccess(session) {
function onSuccess(result) {
var docstring;

if (session.result.inspection) {
if (result.inspection) {
docstring = (
session.result.inspection.type +
": " +
session.result.inspection.string
result.inspection.type + ": " + result.inspection.string
);
}

if (session.result.doc) {
docstring = session.result.doc.usage;
if (session.result.doc.usage) {
docstring += "\n\n" + session.result.doc.description;
if (result.doc) {
docstring = result.doc.usage;
if (result.doc.usage) {
docstring += "\n\n" + result.doc.description;
}
}

Expand All @@ -261,13 +259,13 @@ function inspect_request(request) {
request.respond(this.shellSocket, "inspect_reply", content);
}

function onError(session) {
function onError(result) {
var content = {
status: "error",
execution_count: this.executionCount,
ename: session.result.error.ename,
evalue: session.result.error.evalue,
traceback: session.result.error.traceback,
ename: result.error.ename,
evalue: result.error.evalue,
traceback: result.error.traceback,
};
request.respond(this.shellSocket, "inspect_reply", content);
}
Expand Down
14 changes: 5 additions & 9 deletions lib/kernel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ Kernel.prototype._runStartupScripts = function() {
startupScripts = [];
}
} else {
startupScripts = [];
startupScripts = [];
}

if (DEBUG) console.log("KERNEL: STARTUP: " + startupScripts);
Expand All @@ -409,19 +409,15 @@ Kernel.prototype._runStartupScripts = function() {
return;
}

var task = {
action: "run",
code: code,
onSuccess: function() {
this.session.execute(code, function onSuccess() {
var msg = "KERNEL: STARTUP: '" + script + "' run successfuly";
if (DEBUG) console.log(msg);
},
onError: function() {
function onError() {
var msg = "KERNEL: STARTUP: '" + script + "' failed to run";
if (DEBUG) console.log(msg);
},
};
this.session.run(task);
}
);
}).bind(this));
};

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"jmp": "0.2.x",
"nel": "0.2.x",
"nel": "0.3.x",
"node-uuid": "^1.4.2"
},
"devDependencies": {
Expand Down

0 comments on commit d4f219f

Please sign in to comment.