Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

fix a couple of spelling errors #382

Merged
merged 1 commit into from

2 participants

@juliantaylor

the change in weave breaks api by returning a different string, but hopefully nobody relies on that.

@rgommers
Owner

How do I see that that return string is part of the API? From a quick look at that it seems that it's only used as the message of a TypeError.

@juliantaylor

right, I just didn't look at the code properly.

@rgommers
Owner

OK, this looks good to me then. I'll wait with merging till gh-377 is merged, so that doesn't have to be rebased again.

@rgommers rgommers merged commit 1e2beaf into scipy:master
@rgommers
Owner

merged, thanks @juliantaylor

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 12, 2012
  1. @juliantaylor
This page is out of date. Refresh to see the latest.
View
2  doc/source/tutorial/weave.rst
@@ -1254,7 +1254,7 @@ TypeError.
if(PyCallable_Check(py_obj) && PyInstance_Check(py_obj)) return "callable";
if(PyInstance_Check(py_obj)) return "instance";
if(PyCallable_Check(py_obj)) return "callable";
- return "unkown type";
+ return "unknown type";
}
Since the ``inline`` is also executed within the ``try/catch`` block, you can
View
2  scipy/sparse/sparsetools/numpy.i
@@ -42,7 +42,7 @@ static const char* pytype_string(PyObject* py_obj) {
if (PyModule_Check( py_obj)) return "module" ;
if (PyInstance_Check(py_obj)) return "instance" ;
- return "unkown type";
+ return "unknown type";
}
/* Given a NumPy typecode, return a string describing the type.
View
2  scipy/spatial/qhull.pyx
@@ -981,7 +981,7 @@ class Delaunay(object):
Notes
-----
- The tesselation is computed using the Qhull libary [Qhull]_.
+ The tesselation is computed using the Qhull library [Qhull]_.
.. versionadded:: 0.9
View
26 scipy/special/add_newdocs.py
@@ -825,7 +825,7 @@ def add_newdoc(place, name, doc):
add_newdoc("scipy.special", "kelvin",
"""
- (Be, Ke, Bep, Kep)=kelvin(x) returns the tuple (Be, Ke, Bep, Kep) which containes
+ (Be, Ke, Bep, Kep)=kelvin(x) returns the tuple (Be, Ke, Bep, Kep) which contains
complex numbers representing the real and imaginary Kelvin functions
and their derivatives evaluated at x. For example,
kelvin(x)[0].real = ber x and kelvin(x)[0].imag = bei x with similar
@@ -1085,14 +1085,14 @@ def add_newdoc(place, name, doc):
add_newdoc("scipy.special", "obl_ang1",
"""
(s,sp)=obl_ang1(m,n,c,x) computes the oblate sheroidal angular function
- of the first kind and its derivative (with respect to x) for mode paramters
+ of the first kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``.
""")
add_newdoc("scipy.special", "obl_ang1_cv",
"""
(s,sp)=obl_ang1_cv(m,n,c,cv,x) computes the oblate sheroidal angular function
- of the first kind and its derivative (with respect to x) for mode paramters
+ of the first kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed
characteristic value.
""")
@@ -1106,14 +1106,14 @@ def add_newdoc(place, name, doc):
add_newdoc("scipy.special", "obl_rad1",
"""
(s,sp)=obl_rad1(m,n,c,x) computes the oblate sheroidal radial function
- of the first kind and its derivative (with respect to x) for mode paramters
+ of the first kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``.
""")
add_newdoc("scipy.special", "obl_rad1_cv",
"""
(s,sp)=obl_rad1_cv(m,n,c,cv,x) computes the oblate sheroidal radial function
- of the first kind and its derivative (with respect to x) for mode paramters
+ of the first kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed
characteristic value.
""")
@@ -1121,14 +1121,14 @@ def add_newdoc(place, name, doc):
add_newdoc("scipy.special", "obl_rad2",
"""
(s,sp)=obl_rad2(m,n,c,x) computes the oblate sheroidal radial function
- of the second kind and its derivative (with respect to x) for mode paramters
+ of the second kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``.
""")
add_newdoc("scipy.special", "obl_rad2_cv",
"""
(s,sp)=obl_rad2_cv(m,n,c,cv,x) computes the oblate sheroidal radial function
- of the second kind and its derivative (with respect to x) for mode paramters
+ of the second kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed
characteristic value.
""")
@@ -1182,14 +1182,14 @@ def add_newdoc(place, name, doc):
add_newdoc("scipy.special", "pro_ang1",
"""
(s,sp)=pro_ang1(m,n,c,x) computes the prolate sheroidal angular function
- of the first kind and its derivative (with respect to x) for mode paramters
+ of the first kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``.
""")
add_newdoc("scipy.special", "pro_ang1_cv",
"""
(s,sp)=pro_ang1_cv(m,n,c,cv,x) computes the prolate sheroidal angular function
- of the first kind and its derivative (with respect to x) for mode paramters
+ of the first kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed
characteristic value.
""")
@@ -1203,14 +1203,14 @@ def add_newdoc(place, name, doc):
add_newdoc("scipy.special", "pro_rad1",
"""
(s,sp)=pro_rad1(m,n,c,x) computes the prolate sheroidal radial function
- of the first kind and its derivative (with respect to x) for mode paramters
+ of the first kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``.
""")
add_newdoc("scipy.special", "pro_rad1_cv",
"""
(s,sp)=pro_rad1_cv(m,n,c,cv,x) computes the prolate sheroidal radial function
- of the first kind and its derivative (with respect to x) for mode paramters
+ of the first kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed
characteristic value.
""")
@@ -1218,14 +1218,14 @@ def add_newdoc(place, name, doc):
add_newdoc("scipy.special", "pro_rad2",
"""
(s,sp)=pro_rad2(m,n,c,x) computes the prolate sheroidal radial function
- of the second kind and its derivative (with respect to x) for mode paramters
+ of the second kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and |x|<1.0.
""")
add_newdoc("scipy.special", "pro_rad2_cv",
"""
(s,sp)=pro_rad2_cv(m,n,c,cv,x) computes the prolate sheroidal radial function
- of the second kind and its derivative (with respect to x) for mode paramters
+ of the second kind and its derivative (with respect to x) for mode parameters
m>=0 and n>=m, spheroidal parameter c and ``|x| < 1.0``. Requires pre-computed
characteristic value.
""")
View
2  scipy/weave/common_info.py
@@ -32,7 +32,7 @@
if(PyCallable_Check(py_obj) && PyInstance_Check(py_obj)) return "callable";
if(PyInstance_Check(py_obj)) return "instance";
if(PyCallable_Check(py_obj)) return "callable";
- return "unkown type";
+ return "unknown type";
}
void throw_error(PyObject* exc, const char* msg)
View
2  scipy/weave/cpp_namespace_spec.py
@@ -54,7 +54,7 @@ class ft_converter(cpp_namespace_converter):
class cpp_namespace_converter(base_converter):
_build_information = [common_info.swig_info()]
def __init__(self,class_name=None):
- self.type_name = 'unkown cpp_object'
+ self.type_name = 'unknown cpp_object'
self.name = 'no name'
if class_name:
# customize support_code for whatever type I was handed.
View
2  scipy/weave/doc/tutorial.txt
@@ -1248,7 +1248,7 @@ TypeError.
if(PyCallable_Check(py_obj) && PyInstance_Check(py_obj)) return "callable";
if(PyInstance_Check(py_obj)) return "instance";
if(PyCallable_Check(py_obj)) return "callable";
- return "unkown type";
+ return "unknown type";
}
Since the ``inline`` is also executed within the ``try/catch`` block, you can
View
2  scipy/weave/doc/tutorial_original.html
@@ -1348,7 +1348,7 @@
if(PyCallable_Check(py_obj) &amp;&amp; PyInstance_Check(py_obj)) return "callable";
if(PyInstance_Check(py_obj)) return "instance";
if(PyCallable_Check(py_obj)) return "callable";
- return "unkown type";
+ return "unknown type";
}
</code></pre>
</blockquote>
Something went wrong with that request. Please try again.