Skip to content

Commit 124de1e

Browse files
authored
Merge pull request #606 from mtmiller/pytave-rename
Rename pytave to native Python/C interface
2 parents 811b124 + 177ee8e commit 124de1e

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

NEWS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ octsympy 2.5.0-dev
5353

5454
* `isfinite` behaves correctly for variables (and is documented).
5555

56-
* New experimental Python communication using Pytave, due to
57-
Abhinav Tripathi during Google Summer of Code 2016.
56+
* New experimental Python communication using the native Python/C
57+
interface, due to Abhinav Tripathi during Google Summer of Code 2016.
5858

5959
* Bug fix: assign `[]` to row/column removes that that row/column.
6060

inst/private/python_ipc_driver.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
if (strcmp(lower(which_ipc), 'default'))
4646
if ((exist('pyeval') > 1) && (exist('pyexec') > 1))
47-
which_ipc = 'pytave';
47+
which_ipc = 'native';
4848
elseif (exist('popen2') > 1)
4949
which_ipc = 'popen2';
5050
else
@@ -53,8 +53,8 @@
5353
end
5454

5555
switch lower(which_ipc)
56-
case 'pytave'
57-
[A, db] = python_ipc_pytave(what, cmd, varargin{:});
56+
case 'native'
57+
[A, db] = python_ipc_native(what, cmd, varargin{:});
5858

5959
case 'popen2'
6060
[A, db] = python_ipc_popen2(what, cmd, varargin{:});

inst/private/python_ipc_pytave.m renamed to inst/private/python_ipc_native.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
%% If not, see <http://www.gnu.org/licenses/>.
1919

2020
%% -*- texinfo -*-
21-
%% @deftypefn {Function File} {[@var{A}, @var{info}] =} python_ipc_pytave (@dots{})
21+
%% @deftypefn {Function File} {[@var{A}, @var{info}] =} python_ipc_native (@dots{})
2222
%% Private helper function for Python IPC.
2323
%%
2424
%% @var{A} is the resulting object, which might be an error code.
@@ -31,7 +31,7 @@
3131
%%
3232
%% @end deftypefn
3333

34-
function [A, info] = python_ipc_pytave(what, cmd, varargin)
34+
function [A, info] = python_ipc_native(what, cmd, varargin)
3535

3636
persistent show_msg
3737
persistent have_headers
@@ -53,7 +53,7 @@
5353
if (verbose && isempty(show_msg))
5454
fprintf('OctSymPy v%s: this is free software without warranty, see source.\n', ...
5555
sympref('version'))
56-
disp('Using experimental PyTave communications with SymPy.')
56+
disp('Using experimental native Python/C communications with SymPy.')
5757
show_msg = true;
5858
end
5959

inst/python_cmd.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@
425425
%! assert (isequal (a, 6))
426426

427427
%!xtest error <octoutput does not know how to export type>
428-
%! % This command does not fail with PyTave and '@pyobject'
428+
%! % This command does not fail with native interface and '@pyobject'
429429
%! python_cmd({'return type(int)'});
430430
%!test
431431
%! % ...and after the above test, the pipe should still work

inst/sympref.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@
288288
switch arg
289289
case 'default'
290290
msg = 'Choosing the default [autodetect] communication mechanism';
291-
case 'pytave'
292-
msg = 'Forcing the PyTave communication mechanism';
291+
case 'native'
292+
msg = 'Forcing the native Python/C API communication mechanism';
293293
case 'system'
294294
msg = 'Forcing the system() communication mechanism';
295295
case 'popen2'

0 commit comments

Comments
 (0)