NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.4k

Commit35622d2

committed

Revert "ENH: ship six 1.9.0"

This reverts commit8fe495a.Go back to using external six, to fix bug at#6537.Also - update six required version to 1.10Conflicts:lib/matplotlib/artist.pylib/matplotlib/axes/_base.pylib/matplotlib/backend_tools.pylib/matplotlib/backends/backend_mixed.pylib/matplotlib/backends/backend_pdf.pylib/matplotlib/backends/backend_svg.pylib/matplotlib/colors.pylib/matplotlib/dates.pylib/matplotlib/font_manager.pylib/matplotlib/legend_handler.pylib/matplotlib/tests/test_artist.pylib/matplotlib/tests/test_axes.pylib/matplotlib/tests/test_backend_qt5.pylib/matplotlib/tests/test_dviread.pylib/matplotlib/tests/test_image.pylib/matplotlib/tests/test_lines.pylib/matplotlib/tests/test_spines.pylib/matplotlib/textpath.pylib/mpl_toolkits/axes_grid/colorbar.pylib/mpl_toolkits/axes_grid1/anchored_artists.pylib/mpl_toolkits/axes_grid1/inset_locator.py

1 parent0ac187d commit35622d2Copy full SHA for 35622d2

File tree

224 files changed

+321

-1141

lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+321

-1141

lines changed

`‎lib/matplotlib/init.py`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@`
`102`	`102`	`from __future__import (absolute_import,division,print_function,`
`103`	`103`	`unicode_literals)`
`104`	`104`
`105`		`-frommatplotlib.externalsimportsix`
	`105`	`+importsix`
`106`	`106`	`importsys`
`107`	`107`	`importdistutils.version`
`108`	`108`	`fromitertoolsimportchain`
`@@ -126,8 +126,8 @@`
`126`	`126`	`cycler)`
`127`	`127`
`128`	`128`	`importnumpy`
`129`		`-frommatplotlib.externals.six.moves.urllib.requestimporturlopen`
`130`		`-frommatplotlib.externals.six.movesimportreload_moduleasreload`
	`129`	`+fromsix.moves.urllib.requestimporturlopen`
	`130`	`+fromsix.movesimportreload_moduleasreload`
`131`	`131`
`132`	`132`	`# Get the version from the _version.py versioneer file. For a git checkout,`
`133`	`133`	`# this is computed based on the number of commits since the last tag.`

`‎lib/matplotlib/_mathtext_data.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`from __future__import (absolute_import,division,print_function,`
`5`	`5`	`unicode_literals)`
`6`	`6`
`7`		`-frommatplotlib.externalsimportsix`
	`7`	`+importsix`
`8`	`8`
`9`	`9`	`latex_to_bakoma= {`
`10`	`10`	`'\\__sqrt__' : ('cmex10',0x70),`

`‎lib/matplotlib/_pylab_helpers.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`from __future__import (absolute_import,division,print_function,`
`5`	`5`	`unicode_literals)`
`6`	`6`
`7`		`-frommatplotlib.externalsimportsix`
	`7`	`+importsix`
`8`	`8`	`importsys`
`9`	`9`	`importgc`
`10`	`10`	`importatexit`

`‎lib/matplotlib/afm.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@`
`36`	`36`	`from __future__import (absolute_import,division,print_function,`
`37`	`37`	`unicode_literals)`
`38`	`38`
`39`		`-frommatplotlib.externalsimportsix`
`40`		`-frommatplotlib.externals.six.movesimportmap`
	`39`	`+importsix`
	`40`	`+fromsix.movesimportmap`
`41`	`41`
`42`	`42`	`importsys`
`43`	`43`	`importos`

`‎lib/matplotlib/animation.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@`
`20`	`20`	`from __future__import (absolute_import,division,print_function,`
`21`	`21`	`unicode_literals)`
`22`	`22`
`23`		`-frommatplotlib.externalsimportsix`
`24`		`-frommatplotlib.externals.six.movesimportxrange,zip`
	`23`	`+importsix`
	`24`	`+fromsix.movesimportxrange,zip`
`25`	`25`
`26`	`26`	`importos`
`27`	`27`	`importplatform`

`‎lib/matplotlib/artist.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
	`4`	`+importsix`
`5`	`5`	`fromcollectionsimportOrderedDict`
`6`	`6`
`7`	`7`	`importre`

`‎lib/matplotlib/axes/_axes.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
`5`		`-frommatplotlib.externals.six.movesimportreduce,xrange,zip,zip_longest`
	`4`	`+importsix`
	`5`	`+fromsix.movesimportreduce,xrange,zip,zip_longest`
`6`	`6`
`7`	`7`	`importitertools`
`8`	`8`	`importmath`

`‎lib/matplotlib/axes/_base.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`
`4`	`4`	`fromcollectionsimportOrderedDict`
`5`	`5`
`6`		`-frommatplotlib.externalsimportsix`
`7`		`-frommatplotlib.externals.six.movesimportxrange`
	`6`	`+importsix`
	`7`	`+fromsix.movesimportxrange`
`8`	`8`
`9`	`9`	`importitertools`
`10`	`10`	`importwarnings`

`‎lib/matplotlib/axes/_subplots.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
`5`		`-frommatplotlib.externals.six.movesimportmap`
	`4`	`+importsix`
	`5`	`+fromsix.movesimportmap`
`6`	`6`
`7`	`7`	`frommatplotlib.gridspecimportGridSpec,SubplotSpec`
`8`	`8`	`frommatplotlibimportdocstring`

`‎lib/matplotlib/axis.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`from __future__import (absolute_import,division,print_function,`
`5`	`5`	`unicode_literals)`
`6`	`6`
`7`		`-frommatplotlib.externalsimportsix`
	`7`	`+importsix`
`8`	`8`
`9`	`9`	`frommatplotlibimportrcParams`
`10`	`10`	`importmatplotlib.artistasartist`

`‎lib/matplotlib/backend_bases.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@`
`36`	`36`	`unicode_literals)`
`37`	`37`	`fromcontextlibimportcontextmanager`
`38`	`38`
`39`		`-frommatplotlib.externalsimportsix`
`40`		`-frommatplotlib.externals.six.movesimportxrange`
	`39`	`+importsix`
	`40`	`+fromsix.movesimportxrange`
`41`	`41`
`42`	`42`	`importos`
`43`	`43`	`importsys`

`‎lib/matplotlib/backend_managers.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`from __future__import (absolute_import,division,print_function,`
`8`	`8`	`unicode_literals)`
`9`		`-frommatplotlib.externalsimportsix`
	`9`	`+importsix`
`10`	`10`	`importwarnings`
`11`	`11`
`12`	`12`	`importmatplotlib.cbookascbook`

`‎lib/matplotlib/backend_tools.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`frommatplotlib._pylab_helpersimportGcf`
`17`	`17`	`importmatplotlib.cbookascbook`
`18`	`18`	`fromweakrefimportWeakKeyDictionary`
`19`		`-frommatplotlib.externalsimportsix`
	`19`	`+importsix`
`20`	`20`	`importtime`
`21`	`21`	`importwarnings`
`22`	`22`

`‎lib/matplotlib/backends/init.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
	`4`	`+importsix`
`5`	`5`
`6`	`6`	`importmatplotlib`
`7`	`7`	`importinspect`

`‎lib/matplotlib/backends/backend_agg.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`from __future__import (absolute_import,division,print_function,`
`23`	`23`	`unicode_literals)`
`24`	`24`
`25`		`-frommatplotlib.externalsimportsix`
	`25`	`+importsix`
`26`	`26`
`27`	`27`	`importthreading`
`28`	`28`	`importnumpyasnp`

`‎lib/matplotlib/backends/backend_cairo.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`from __future__import (absolute_import,division,print_function,`
`22`	`22`	`unicode_literals)`
`23`	`23`
`24`		`-frommatplotlib.externalsimportsix`
	`24`	`+importsix`
`25`	`25`
`26`	`26`	`importos,sys,warnings,gzip`
`27`	`27`

`‎lib/matplotlib/backends/backend_cocoaagg.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`from __future__import (absolute_import,division,print_function,`
`16`	`16`	`unicode_literals)`
`17`	`17`
`18`		`-frommatplotlib.externalsimportsix`
`19`		`-frommatplotlib.externals.six.movesimportxrange`
	`18`	`+importsix`
	`19`	`+fromsix.movesimportxrange`
`20`	`20`
`21`	`21`	`importos,sys`
`22`	`22`

`‎lib/matplotlib/backends/backend_gdk.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
	`4`	`+importsix`
`5`	`5`
`6`	`6`	`importmath`
`7`	`7`	`importos`

`‎lib/matplotlib/backends/backend_gtk.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
	`4`	`+importsix`
`5`	`5`
`6`	`6`	`importos,sys,warnings`
`7`	`7`	`deffn_name():returnsys._getframe(1).f_code.co_name`

`‎lib/matplotlib/backends/backend_gtk3.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
	`4`	`+importsix`
`5`	`5`
`6`	`6`	`importos,sys`
`7`	`7`	`deffn_name():returnsys._getframe(1).f_code.co_name`

`‎lib/matplotlib/backends/backend_gtk3agg.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
	`4`	`+importsix`
`5`	`5`
`6`	`6`	`importnumpyasnp`
`7`	`7`	`importsys`

`‎lib/matplotlib/backends/backend_gtk3cairo.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
	`4`	`+importsix`
`5`	`5`
`6`	`6`	`from .importbackend_gtk3`
`7`	`7`	`from .importbackend_cairo`

`‎lib/matplotlib/backends/backend_gtkagg.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`from __future__import (absolute_import,division,print_function,`
`5`	`5`	`unicode_literals)`
`6`	`6`
`7`		`-frommatplotlib.externalsimportsix`
	`7`	`+importsix`
`8`	`8`
`9`	`9`	`importos`
`10`	`10`

`‎lib/matplotlib/backends/backend_gtkcairo.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`from __future__import (absolute_import,division,print_function,`
`6`	`6`	`unicode_literals)`
`7`	`7`
`8`		`-frommatplotlib.externalsimportsix`
	`8`	`+importsix`
`9`	`9`
`10`	`10`	`importgtk`
`11`	`11`	`ifgtk.pygtk_version< (2,7,0):`

`‎lib/matplotlib/backends/backend_macosx.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
	`4`	`+importsix`
`5`	`5`
`6`	`6`	`importos`
`7`	`7`

`‎lib/matplotlib/backends/backend_mixed.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`importnumpyasnp`
`5`	`5`
`6`		`-frommatplotlib.externalsimportsix`
	`6`	`+importsix`
`7`	`7`
`8`	`8`	`frommatplotlib.backends.backend_aggimportRendererAgg`
`9`	`9`	`frommatplotlib.tight_bboximportprocess_figure_for_rasterizing`

`‎lib/matplotlib/backends/backend_nbagg.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`fromtempfileimportmkdtemp`
`10`	`10`	`importshutil`
`11`	`11`	`importos`
`12`		`-frommatplotlib.externalsimportsix`
	`12`	`+importsix`
`13`	`13`	`fromuuidimportuuid4asuuid`
`14`	`14`
`15`	`15`	`fromIPython.displayimportdisplay,HTML`

`‎lib/matplotlib/backends/backend_pdf.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`from __future__import (absolute_import,division,print_function,`
`8`	`8`	`unicode_literals)`
`9`	`9`
`10`		`-frommatplotlib.externalsimportsix`
	`10`	`+importsix`
`11`	`11`
`12`	`12`	`importcodecs`
`13`	`13`	`importos`
`@@ -21,7 +21,7 @@`
`21`	`21`	`fromfunctoolsimporttotal_ordering`
`22`	`22`
`23`	`23`	`importnumpyasnp`
`24`		`-frommatplotlib.externals.siximportunichr`
	`24`	`+fromsiximportunichr`
`25`	`25`
`26`	`26`
`27`	`27`	`fromdatetimeimportdatetime`

`‎lib/matplotlib/backends/backend_pgf.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
	`4`	`+importsix`
`5`	`5`
`6`	`6`	`importmath`
`7`	`7`	`importos`

`‎lib/matplotlib/backends/backend_ps.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`from __future__import (absolute_import,division,print_function,`
`6`	`6`	`unicode_literals)`
`7`	`7`
`8`		`-frommatplotlib.externalsimportsix`
`9`		`-frommatplotlib.externals.six.movesimportStringIO`
	`8`	`+importsix`
	`9`	`+fromsix.movesimportStringIO`
`10`	`10`
`11`	`11`	`importglob,math,os,shutil,sys,time`
`12`	`12`	`def_fn_name():returnsys._getframe(1).f_code.co_name`

`‎lib/matplotlib/backends/backend_qt4.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
`4`		`-frommatplotlib.externalsimportsix`
`5`		`-frommatplotlib.externals.siximportunichr`
	`4`	`+importsix`
	`5`	`+fromsiximportunichr`
`6`	`6`	`importos`
`7`	`7`	`importre`
`8`	`8`	`importsignal`

`‎lib/matplotlib/backends/backend_qt4agg.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`from __future__import (absolute_import,division,print_function,`
`5`	`5`	`unicode_literals)`
`6`	`6`
`7`		`-frommatplotlib.externalsimportsix`
	`7`	`+importsix`
`8`	`8`
`9`	`9`	`importos# not used`
`10`	`10`	`importsys`

`‎lib/matplotlib/backends/backend_qt5.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`		`-frommatplotlib.externalsimportsix`
	`3`	`+importsix`
`4`	`4`
`5`	`5`	`importos`
`6`	`6`	`importre`
`7`	`7`	`importsignal`
`8`	`8`	`importsys`
`9`		`-frommatplotlib.externals.siximportunichr`
	`9`	`+fromsiximportunichr`
`10`	`10`
`11`	`11`	`importmatplotlib`
`12`	`12`

`‎lib/matplotlib/backends/backend_qt5agg.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`from __future__import (absolute_import,division,print_function,`
`5`	`5`	`unicode_literals)`
`6`	`6`
`7`		`-frommatplotlib.externalsimportsix`
	`7`	`+importsix`
`8`	`8`
`9`	`9`	`importsys`
`10`	`10`	`importctypes`

`‎lib/matplotlib/backends/backend_svg.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`
`4`	`4`	`fromcollectionsimportOrderedDict`
`5`	`5`
`6`		`-frommatplotlib.externalsimportsix`
`7`		`-frommatplotlib.externals.six.movesimportxrange`
	`6`	`+importsix`
	`7`	`+fromix.movesimportxrange`
`8`	`8`	`frommatplotlib.externals.siximportunichr`
`9`	`9`
`10`	`10`	`importos,base64,tempfile,gzip,io,sys,codecs,re`

`‎lib/matplotlib/backends/backend_template.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`from __future__import (absolute_import,division,print_function,`
`66`	`66`	`unicode_literals)`
`67`	`67`
`68`		`-frommatplotlib.externalsimportsix`
	`68`	`+importsix`
`69`	`69`
`70`	`70`	`importmatplotlib`
`71`	`71`	`frommatplotlib._pylab_helpersimportGcf`

0 commit comments

Comments

(0)

Movatterモバイル変換

Uh oh!

File tree

224 files changed

Some content is hidden

224 files changed

0 commit comments