8000 Fix reading/writing from urllib.request objects by mdboom · Pull Request #5910 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Fix reading/writing from urllib.request objects #5910

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
merged 2 commits into from
Jan 25, 2016
Merged

Fix reading/writing from urllib.request objects #5910

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9758da5
Fix reading/writing from urllib.request objects
mdboom Jan 25, 2016
879c186
Add @attr('network')
mdboom Jan 25, 2016
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
Next Next commit
Fix reading/writing from urllib.request objects
  • Loading branch information
@mdboom
mdboom committed Jan 25, 2016
commit 9758da584590910c9b8f09285c9337107721de03
7 changes: 7 additions & 0 deletions lib/matplotlib/tests/test_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,13 @@ def test_minimized_rasterized():
assert False


@cleanup
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesn't this need a @attr('network') decorator too?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed. I forgot we had that.

def test_load_from_url():
req = six.moves.urllib.request.urlopen(
"http://matplotlib.org/_static/logo_sidebar_horiz.png")
Z = plt.imread(req)


if __name__=='__main__':
import nose
nose.runmodule(argv=['-s','--with-doctest'], exit=False)
35 changes: 25 additions & 10 deletions src/_png.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,17 @@ static PyObject *Py_write_png(PyObject *self, PyObject *args, PyObject *kwds)
goto exit;
}
buff.cursor = 0;
} else if ((fp = mpl_PyFile_Dup(py_file, (char *)"wb", &offset))) {
} else {
#if PY3K
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just remembered seeing an article recently imploring that we stop writing if-statements like this that would possibly break in py4.x. The logic really should be checking whether or not it is py2.x, as py2.x should be considered the exception to the rule.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope -- this won't break. Here's the definition of it in mpl_utils.h:

#if PY_MAJOR_VERSION >= 3
#define PY3K 1
#define Py_TPFLAGS_HAVE_NEWBUFFER 0
#else
#define PY3K 0
#endif

I take PY3K to mean "next-gen Python" as it was called before Python 3.0 was even released.

if (close_file) {
#else
if (close_file || PyFile_Check(py_file)) {
#endif
fp = mpl_PyFile_Dup(py_file, (char *)"wb", &offset);
}
}

if (fp) {
close_dup_file = true;
} else {
PyErr_Clear();
Expand Down Expand Up @@ -374,10 +384,23 @@ static PyObject *_read_png(PyObject *filein, bool float_result)
py_file = filein;
}

if ((fp = mpl_PyFile_Dup(py_file, (char *)"rb", &offset))) {
#if PY3K
if (close_file) {
#else
if (close_file || PyFile_Check(py_file)) {
#endif
fp = mpl_PyFile_Dup(py_file, (char *)"rb", &offset);
}

if (fp) {
close_dup_file = true;
if (fread(header, 1, 8, fp) != 8) {
PyErr_SetString(PyExc_IOError, "error reading PNG header");
goto exit;
}
} else {
PyErr_Clear();

PyObject *read_method = PyObject_GetAttrString(py_file, "read");
if (!(read_method && PyCallable_Check(read_method))) {
Py_XDECREF(read_method);
Expand All @@ -387,14 +410,6 @@ static PyObject *_read_png(PyObject *filein, bool float_result)
goto exit;
}
Py_XDECREF(read_method);
}

if (fp) {
if (fread(header, 1, 8, fp) != 8) {
PyErr_SetString(PyExc_IOError, "error reading PNG header");
goto exit;
}
} else {
_read_png_data(py_file, header, 8);
}

Expand Down
0