Thanks to visit codestin.com
Credit goes to github.com

Skip to content

The MEGA Python 3.x branch merge #565

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

Jump to bottom
Merged
merged 153 commits into from
Nov 9, 2011
Merged

The MEGA Python 3.x branch merge #565

merged 153 commits into from
Nov 9, 2011

Conversation

mdboom
Copy link
Member

@mdboom mdboom commented Oct 31, 2011

This is a merge of the matplotlib-py3 fork back into matplotlib master.

Here you should be able to see all in one place the changes made to
matplotlib make it run on Python 2.6 - 3.2.

mdboom and others added 30 commits February 22, 2011 10:21
@mdboom @ddale
C/C++ compiling (not necessarily working) with Py3K
cec3212 
svn path=/branches/py3k/; revision=8551
@dopplershift @ddale
Convert uses of the builtin file() to the builtin open(). Calls to fi…
5336b98 
…le() are not converted by 2to3.

svn path=/branches/py3k/; revision=8552
@dopplershift @ddale
Fix import from _path and combine with other existing (working) import.
9e2805a 
svn path=/branches/py3k/; revision=8553
@mdboom @ddale
Fix compilation in Python 2.x
192f67e 
svn path=/branches/py3k/; revision=8556
@mdboom @ddale
Able to produce simple_plot.py!!!
acbe206 
svn path=/branches/py3k/; revision=8561
@astropy-buildbot @ddale
Make TkAgg backend compile and work.
1bcfeac
@astropy-buildbot @ddale
Update for new signature of MethodType in Python 3.1 (Let's assume Py…
b90e18b 
…thon 3.0 is "unsupported" for now).
@astropy-buildbot @ddale
Consistent way of handling version checks.
654e1fd
@astropy-buildbot @ddale
Remove debugging detritus.
d2ebfab 
Bump fontCache version number by a significant amount, since the master version number has increased in the meantime and we don't want the two to collide.
@astropy-buildbot @ddale
Fix mistake in last commit -- still getting my git legs.
78ed16a
@astropy-buildbot
Consistent use of PY3K #define everywhere.
81219db
@astropy-buildbot
First pass at getting Qt4Agg backend working.
0f58de4
@astropy-buildbot
First pass at SVG backend.
13c93fb
@astropy-buildbot
Fix font manager so it doesn't miss some fonts whose attributes don't…
ba5610f 
… parse as UTF-8.

Update font manager to have same font path search as master.
@astropy-buildbot
First pass at PDF backend.
4df3275
@astropy-buildbot
Fix TkAgg backend on Python 2.x
7f4f644
@astropy-buildbot
First pass at PS backend.
7fdae0a
@astropy-buildbot
Fix PS backend for Python 2.x
ef7f818
@astropy-buildbot
First time passing "mathtext demo"
1b03d30
@astropy-buildbot
Fix Python 2.x build
ac0cf85
@astropy-buildbot
Get mathtext working on Python 2.x. Must ship two versions of pyparsing.
df12d4e
@astropy-buildbot
First pass at usetex support.
0167aa6
@astropy-buildbot
Use more modern io module in SVG backend.
016cba4
@mdboom
Initial progress on Agg buffer support.
31a428c
@mdboom
Backporting lots of Python 2.x-safe changes based on the output of 2to3.
503367f
@mdboom
Add missing print function conversion.
a74a66d
@mdboom
Revert some changes to PDF Type 3 generation to make text placement e…
af0f269 
…xactly the same as in Matplotlib 1.0.x
@mdboom
Import izip where necessary
381ae70
@mdboom
Basic changes to make regression tests run under Python 3.x
4cdfa69
@mdboom
Forgot another print function change.
75b1d10
mdboom and others added 14 commits June 28, 2011 14:42
@mdboom
Merge branch 'master' of github.com:matplotlib/matplotlib-py3
09de6ad
@mdboom
Merged from main/master
786bab9
@mdboom
Be more careful about closing files, since the gc doesn't always clos…
4cb2aaa 
…e them for us under Python 3.x. This uses the "with" statement where possible.
@mdboom
Python 3.x fixes in new generic marker code.
1f074a8
@mdboom
Disable test_symlog2 -- it consumes unbounded amounts of RAM on Pytho…
ab078c9 
…n 3.2
@mdboom
Remove image comparisons for figure_today -- redundant.
6c8bf3b
@mdboom
Fix Python 3.x build -- Tkinter -> tkinter
a4f5fa5
@mdboom
Fix bbox_inches="tight" in Python 3.x
927acf8
@mdboom
Fix error reporting in png extension.
6a735e2
@mdboom
Use integer division to make the tests pass on Python3
cedc5ad
@mdboom
Merge remote-tracking branch 'main/master'
cafa53c 
Conflicts:
	CHANGELOG
	INSTALL
	doc/_templates/indexsidebar.html
	doc/mpl_toolkits/mplot3d/api.rst
	examples/api/sankey_demo_old.py
	examples/pylab_examples/stix_fonts_demo.py
	examples/user_interfaces/embedding_in_tk.py
	examples/user_interfaces/embedding_in_tk2.py
	lib/matplotlib/axes.py
	lib/matplotlib/backend_bases.py
	lib/matplotlib/backends/backend_gtk.py
	lib/matplotlib/backends/backend_qt4.py
	lib/matplotlib/backends/backend_svg.py
	lib/matplotlib/backends/qt4_editor/formlayout.py
	lib/matplotlib/lines.py
	lib/matplotlib/markers.py
	lib/matplotlib/mathtext.py
	lib/matplotlib/scale.py
	lib/matplotlib/sphinxext/ipython_directive.py
	lib/matplotlib/sphinxext/plot_directive.py
	lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf
	lib/matplotlib/tests/baseline_images/test_axes/symlog.png
	lib/matplotlib/tests/baseline_images/test_axes/symlog.svg
	lib/matplotlib/tests/baseline_images/test_axes/symlog2.pdf
	lib/matplotlib/tests/baseline_images/test_axes/symlog2.png
	lib/matplotlib/tests/baseline_images/test_axes/symlog2.svg
	lib/matplotlib/tests/test_axes.py
	lib/matplotlib/tests/test_figure.py
	lib/matplotlib/tests/test_mlab.py
	lib/matplotlib/tests/test_text.py
	lib/matplotlib/textpath.py
	lib/matplotlib/ticker.py
	lib/mpl_toolkits/axisartist/angle_helper.py
	release/win32/data/setupwin.py
	release/win32/data/setupwinegg.py
	setupext.py
	src/_png.cpp
	src/_tkagg.cpp
@mdboom
Make tests work again.
6261ad1
@mdboom
Merge remote-tracking branch 'py3-main/master' into py3-merge
677f9cc
@jenshnielsen
Fix TypeError: __bool__ should return bool, returned int in python3. …
e247424 
…__bool__ is converted from __nozero__ by 2to3

so change this to return bool
@jenshnielsen
Copy link
Member

I tested the python3 branch on both python3 and 2
I see around 170 errors when running the test suite in python3 and have submitted a pull request against this pull request.

All the errors are all of TypeError: __bool__ should return bool, returned int

This is fixed by changing __nozero__ to return bool. 2to3 converts this to __bool__ that must return a bool not an integer. I don't know if this has any negative side effects on python2 nonzero but
it does not change the number of tests passing on python2.

In addition I see two new failures on both python3 and 2 using this branch. 'Tight_layout5' and
'interp_nearest_vs_none' both fail in the svg version because the none interpolation images are
updown inverted. This does not seem to happen on master. (I also see a failure on master using tight_layout5 but the difference is smaller and the image is not inverted)

@mdboom
Copy link
Member Author

mdboom commented Nov 4, 2011

I have all of the tests running in Python 3.x and Python 2.x now. Those who previously reported problems, @jenshnielsen, @leejjoon etc., can you please confirm?

@jenshnielsen
Copy link
Member

I see all tests passing in both python2.7 and python3.2. Thanks.

mdboom added a commit that referenced this pull request Nov 9, 2011
@mdboom
Merge pull request #565 from mdboom/py3-merge
05929fe 
The MEGA Python 3.x branch merge
@mdboom mdboom merged commit 05929fe into matplotlib:master Nov 9, 2011
@mdboom mdboom deleted the py3-merge branch March 3, 2015 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.