Skip to content

Fix io.ascii test failures on Windows #3525

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.

Sign up for GitHub

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
embray merged 15 commits into from
Feb 25, 2015
Merged

Fix io.ascii test failures on Windows #3525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
32a31d3
Use the access= argument to mmap instead of prot= as it is more platf…
embray Feb 19, 2015
f95c04a
The strtod provided by the MS C runtime does not understand strings l…
embray Feb 19, 2015
9d612cb
I'm not 100% sure about how I feel about this approach, as it's a lit…
embray Feb 19, 2015
664f673
This test was crashing on Windows due to trying to use parallel mode
embray Feb 19, 2015
a37714d
Kind of annoying, but since the writer writes with os.linesep, we sho…
embray Feb 19, 2015
08b5d04
Use slash-\t in these test examples instead of tab literals so as to …
embray Feb 19, 2015
c781df1
Re-enable tests on AppVeyor
embray Feb 19, 2015
b50cbba
Defined NAN for when building with MSVC
embray Feb 19, 2015
772962e
Replace tabs with spaces throughout this file
embray Feb 24, 2015
2c19dda
Support nan/inf strings for xstrtod and on platforms whose strtod do …
embray Feb 24, 2015
63d5029
Fixed NAN and INFINITY definitions on Windows--oops.
embray Feb 24, 2015
11d8c48
Adds our own strncasecmp since this isn't available on Windows (or at…
embray Feb 24, 2015
d57b6f3
More indentation and whitespace cleanup. Tried to get other code style
embray Feb 25, 2015
a151f50
Fixed indentation here too to match logic [skip ci]
embray Feb 25, 2015
93d0565
Add changelog entry for these fixes [skip ci]
embray Feb 25, 2015
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
15 changes: 15 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,21 @@ New Features
also removes duplicate format guesses to improve performance. [#3418]


1.0.1 (unreleased)
------------------

Bug Fixes
^^^^^^^^^

- ``astropy.io.ascii``

- Fixed support for reading inf and nan values with the fast reader in
Windows. Also fixed in the case of using ``use_fast_converter=True``
with the fast reader. [#3525]

- Fixed use of mmap in the fast reader on Windows. [#3525]


1.0 (2015-02-18)
----------------

Expand Down
2 changes: 1 addition & 1 deletion astropy/io/ascii/cparser.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ cdef class FileString:
self.fhandle = open(fname, 'r')
if not self.fhandle:
raise IOError('File "{0}" could not be opened'.format(fname))
self.mmap = mmap.mmap(self.fhandle.fileno(), 0, prot=mmap.PROT_READ)
self.mmap = mmap.mmap(self.fhandle.fileno(), 0, access=mmap.ACCESS_READ)
cdef Py_ssize_t buf_len = len(self.mmap)
if six.PY2:
PyObject_AsReadBuffer(self.mmap, &self.mmap_ptr, &buf_len)
Expand Down
Loading