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

Commita7aaa83

committed

Merge pull request#1195 from pelson/pickle_fix_2

Fixed pickle tests to use the BufferIO object for python3 support.

2 parents0eb6c8c +40fc5d6 commita7aaa83Copy full SHA for a7aaa83

File tree

1 file changed

-8

lines changed

lib/matplotlib/tests
- test_pickle.py

1 file changed

-8

lines changed

`‎lib/matplotlib/tests/test_pickle.py`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`importcPickleaspickle`
`12`	`12`	`#import pickle`
`13`	`13`
`14`		`-fromcStringIOimportStringIO`
	`14`	`+fromioimportBytesIO`
`15`	`15`
`16`	`16`
`17`	`17`	`defdepth_getter(obj,`
`@@ -87,7 +87,7 @@ def recursive_pickle(top_obj):`
`87`	`87`	`for_,obj,locationinobjs:`
`88`	`88`	`# print('trying %s' % location)`
`89`	`89`	`try:`
`90`		`-pickle.dump(obj,StringIO(),pickle.HIGHEST_PROTOCOL)`
	`90`	`+pickle.dump(obj,BytesIO(),pickle.HIGHEST_PROTOCOL)`
`91`	`91`	`exceptException,err:`
`92`	`92`	`print(obj)`
`93`	`93`	`print('Failed to pickle %s.\n Type: %s. Traceback follows:'% (location,type(obj)))`
`@@ -99,21 +99,21 @@ def test_simple():`
`99`	`99`	`fig=plt.figure()`
`100`	`100`	`# un-comment to debug`
`101`	`101`	`# recursive_pickle(fig)`
`102`		`-pickle.dump(fig,StringIO(),pickle.HIGHEST_PROTOCOL)`
	`102`	`+pickle.dump(fig,BytesIO(),pickle.HIGHEST_PROTOCOL)`
`103`	`103`
`104`	`104`	`ax=plt.subplot(121)`
`105`		`-pickle.dump(ax,StringIO(),pickle.HIGHEST_PROTOCOL)`
	`105`	`+pickle.dump(ax,BytesIO(),pickle.HIGHEST_PROTOCOL)`
`106`	`106`
`107`	`107`	`ax=plt.axes(projection='polar')`
`108`	`108`	`plt.plot(range(10),label='foobar')`
`109`	`109`	`plt.legend()`
`110`	`110`
`111`	`111`	`# recursive_pickle(fig)`
`112`		`-pickle.dump(ax,StringIO(),pickle.HIGHEST_PROTOCOL)`
	`112`	`+pickle.dump(ax,BytesIO(),pickle.HIGHEST_PROTOCOL)`
`113`	`113`
`114`	`114`	`# ax = plt.subplot(121, projection='hammer')`
`115`	`115`	`# recursive_pickle(ax, 'figure')`
`116`		`-# pickle.dump(ax,StringIO(), pickle.HIGHEST_PROTOCOL)`
	`116`	`+# pickle.dump(ax,BytesIO(), pickle.HIGHEST_PROTOCOL)`
`117`	`117`
`118`	`118`
`119`	`119`	`@image_comparison(baseline_images=['multi_pickle'],`
`@@ -163,7 +163,7 @@ def test_complete():`
`163`	`163`	`# Uncomment to debug any unpicklable objects. This is slow (~200 seconds).`
`164`	`164`	`# recursive_pickle(fig)`
`165`	`165`
`166`		`-result_fh=StringIO()`
	`166`	`+result_fh=BytesIO()`
`167`	`167`	`pickle.dump(fig,result_fh,pickle.HIGHEST_PROTOCOL)`
`168`	`168`
`169`	`169`	`plt.close('all')`
`@@ -196,4 +196,4 @@ def test_no_pyplot():`
`196`	`196`	`# Uncomment to debug any unpicklable objects. This is slow so is not`
`197`	`197`	`# uncommented by default.`
`198`	`198`	`# recursive_pickle(fig)`
`199`		`-pickle.dump(fig,StringIO(),pickle.HIGHEST_PROTOCOL)`
	`199`	`+pickle.dump(fig,BytesIO(),pickle.HIGHEST_PROTOCOL)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commita7aaa83

File tree

1 file changed

1 file changed

`‎lib/matplotlib/tests/test_pickle.py`

0 commit comments