8000 DOC,BUG: Fix some latex generation problems. by charris · Pull Request #6944 · numpy/numpy · GitHub
[go: up one dir, main page]

Skip to content

DOC,BUG: Fix some latex generation problems. #6944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/release/1.10.3-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ the PR number for the original PR against master is listed.
* gh-6884 REL: Update pavement.py and setup.py to reflect current version.
* gh-6916 BUG: Fix test_f2py so it runs correctly in runtests.py.
* gh-6924 BUG: Fix segfault gh-6922.
* gh-6943 DOC,BUG: Fix some latex generation problems.

31 changes: 15 additions & 16 deletions numpy/add_newdocs.py
Original file line number Diff line number Diff line change
Expand Up @@ -3829,13 +3829,13 @@ def luf(lamdaexpr, *args, **kwargs):
----------
new_order : string, optional
Byte order to force; a value from the byte order specifications
above. `new_order` codes can be any of::
below. `new_order` codes can be any of:

* 'S' - swap dtype from current to opposite endian
* {'<', 'L'} - little endian
* {'>', 'B'} - big endian
* {'=', 'N'} - native order
* {'|', 'I'} - ignore (no change to byte order)
* 'S' - swap dtype from current to opposite endian
* {'<', 'L'} - little endian
* {'>', 'B'} - big endian
* {'=', 'N'} - native order
* {'|', 'I'} - ignore (no change to byte order)

The default value ('S') results in swapping the current
byte order. The code does a case-insensitive check on the first
Expand Down Expand Up @@ -6298,16 +6298,15 @@ def luf(lamdaexpr, *args, **kwargs):
Parameters
----------
new_order : string, optional
Byte order to force; a value from the byte order
specifications below. The default value ('S') results in
swapping the current byte order.
`new_order` codes can be any of::
Byte order to force; a value from the byte order specifications
below. The default value ('S') results in swapping the current
byte order. `new_order` codes can be any of:

* 'S' - swap dtype from current to opposite endian
* {'<', 'L'} - little endian
* {'>', 'B'} - big endian
* {'=', 'N'} - native order
* {'|', 'I'} - ignore (no change to byte order)
* 'S' - swap dtype from current to opposite endian
* {'<', 'L'} - little endian
* {'>', 'B'} - big endian
* {'=', 'N'} - native order
* {'|', 'I'} - ignore (no change to byte order)

The code does a case-insensitive check on the first letter of
`new_order` for these alternatives. For example, any of '>'
Expand Down Expand Up @@ -7170,10 +7169,10 @@ def luf(lamdaexpr, *args, **kwargs):

The `new_order` code can be any from the following:

* 'S' - swap dtype from current to opposite endian
* {'<', 'L'} - little endian
* {'>', 'B'} - big endian
* {'=', 'N'} - native order
* 'S' - swap dtype from current to opposite endian
* {'|', 'I'} - ignore (no change to byte order)

Parameters
Expand Down
17 changes: 17 additions & 0 deletions numpy/lib/user_array.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""
Standard container-class for easy multiple-inheritance.

Try to inherit from the ndarray instead of using this class as this is not
complete.

Expand All @@ -16,7 +17,19 @@


class container(object):
"""
container(data, dtype=None, copy=True)

Standard container-class for easy multiple-inheritance.

Methods
-------
copy
tostring
byteswap
astype

"""
def __init__(self, data, dtype=None, copy=True):
self.array = array(data, dtype, copy=copy)

Expand Down Expand Up @@ -219,15 +232,19 @@ def __ge__(self, other):
return self._rc(greater_equal(self.array, other))

def copy(self):
""
return self._rc(self.array.copy())

def tostring(self):
""
return self.array.tostring()

def byteswap(self):
""
return self._rc(self.array.byteswap())

def astype(self, typecode):
""
return self._rc(self.array.astype(typecode))

def _rc(self, a):
Expand Down
0