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

Skip to content

Commit f4adec7

Browse files
mdboommdboom
committed
Use six instead of 2to3
1 parent d0a0100 commit f4adec7

File tree

227 files changed

+2545
-1670
lines changed

Some content is hidden

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

227 files changed

+2545
-1670
lines changed

‎boilerplate.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
# For some later history, see
1717
# http://thread.gmane.org/gmane.comp.python.matplotlib.devel/7068
1818

19+
from __future__ import absolute_import, division, print_function, unicode_literals
20+
21+
import six
22+
1923
import os
2024
import inspect
2125
import random

‎doc/conf.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
'sphinxext.github',
3535
'numpydoc']
3636

37-
3837
try:
3938
import numpydoc
4039
except ImportError:
@@ -53,6 +52,9 @@
5352
# The suffix of source filenames.
5453
source_suffix = '.rst'
5554

55+
# This is the default encoding, but it doesn't hurt to be explicit
56+
source_encoding = "utf-8"
57+
5658
# The master toctree document.
5759
master_doc = 'contents'
5860

‎doc/users/plotting/examples/pgf_preamble.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# -*- coding: utf-8 -*-
2+
from __future__ import absolute_import, division, print_function, unicode_literals
3+
4+
import six
25

36
import matplotlib as mpl
47
mpl.use("pgf")
@@ -7,9 +10,9 @@
710
"text.usetex": True, # use inline math for ticks
811
"pgf.rcfonts": False, # don't setup fonts from rc parameters
912
"pgf.preamble": [
10-
r"\usepackage{units}", # load additional packages
11-
r"\usepackage{metalogo}",
12-
r"\usepackage{unicode-math}", # unicode math setup
13+
"\\usepackage{units}", # load additional packages
14+
"\\usepackage{metalogo}",
15+
"\\usepackage{unicode-math}", # unicode math setup
1316
r"\setmathfont{xits-math.otf}",
1417
r"\setmainfont{DejaVu Serif}", # serif font via preamble
1518
]
@@ -19,9 +22,9 @@
1922
import matplotlib.pyplot as plt
2023
plt.figure(figsize=(4.5,2.5))
2124
plt.plot(range(5))
22-
plt.xlabel(u"unicode text: я, ψ, €, ü, \\unitfrac[10]{°}{µm}")
23-
plt.ylabel(u"\\XeLaTeX")
24-
plt.legend([u"unicode math: $λ=∑_i^∞ μ_i^2$"])
25+
plt.xlabel("unicode text: я, ψ, €, ü, \\unitfrac[10]{°}{µm}")
26+
plt.ylabel("\\XeLaTeX")
27+
plt.legend(["unicode math: $λ=∑_i^∞ μ_i^2$"])
2528
plt.tight_layout(.5)
2629

2730
plt.savefig("pgf_preamble.pdf")

‎lib/matplotlib/__init__.py

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@
9797
to MATLAB®, a registered trademark of The MathWorks, Inc.
9898
9999
"""
100-
from __future__ import print_function, absolute_import
100+
from __future__ import absolute_import, division, print_function, unicode_literals
101101

102+
import six
102103
import sys
103104
import distutils.version
104105

@@ -166,17 +167,6 @@ def _forward_ilshift(self, other):
166167

167168
import sys, os, tempfile
168169

169-
if sys.version_info[0] >= 3:
170-
def ascii(s): return bytes(s, 'ascii')
171-
172-
def byte2str(b): return b.decode('ascii')
173-
174-
else:
175-
ascii = str
176-
177-
def byte2str(b): return b
178-
179-
180170
from matplotlib.rcsetup import (defaultParams,
181171
validate_backend,
182172
validate_toolbar)
@@ -224,7 +214,7 @@ def _is_writable_dir(p):
224214
try:
225215
t = tempfile.TemporaryFile(dir=p)
226216
try:
227-
t.write(ascii('1'))
217+
t.write(b'1')
228218
finally:
229219
t.close()
230220
except OSError:
@@ -304,7 +294,7 @@ def wrap(self, fmt, func, level='helpful', always=True):
304294
if always is True, the report will occur on every function
305295
call; otherwise only on the first time the function is called
306296
"""
307-
assert callable(func)
297+
assert six.callable(func)
308298
def wrapper(*args, **kwargs):
309299
ret = func(*args, **kwargs)
310300

@@ -330,7 +320,7 @@ def checkdep_dvipng():
330320
s = subprocess.Popen(['dvipng','-version'], stdout=subprocess.PIPE,
331321
stderr=subprocess.PIPE)
332322
line = s.stdout.readlines()[1]
333-
v = byte2str(line.split()[-1])
323+
v = line.split()[-1].decode('ascii')
334324
return v
335325
except (IndexError, ValueError, OSError):
336326
return None
@@ -347,7 +337,7 @@ def checkdep_ghostscript():
347337
stderr=subprocess.PIPE)
348338
stdout, stderr = s.communicate()
349339
if s.returncode == 0:
350-
v = byte2str(stdout[:-1])
340+
v = stdout[:-1]
351341
return gs_exec, v
352342

353343
return None, None
@@ -358,7 +348,7 @@ def checkdep_tex():
358348
try:
359349
s = subprocess.Popen(['tex','-version'], stdout=subprocess.PIPE,
360350
stderr=subprocess.PIPE)
361-
line = byte2str(s.stdout.readlines()[0])
351+
line = s.stdout.readlines()[0].decode('ascii')
362352
pattern = '3\.1\d+'
363353
match = re.search(pattern, line)
364354
v = match.group(0)
@@ -372,7 +362,7 @@ def checkdep_pdftops():
372362
stderr=subprocess.PIPE)
373363
for line in s.stderr:
374364
if b'version' in line:
375-
v = byte2str(line.split()[-1])
365+
v = line.split()[-1].decode('ascii')
376366
return v
377367
except (IndexError, ValueError, UnboundLocalError, OSError):
378368
return None
@@ -383,7 +373,7 @@ def checkdep_inkscape():
383373
stderr=subprocess.PIPE)
384374
for line in s.stdout:
385375
if b'Inkscape' in line:
386-
v = byte2str(line.split()[1])
376+
v = line.split()[1].decode('ascii')
387377
break
388378
return v
389379
except (IndexError, ValueError, UnboundLocalError, OSError):
@@ -395,7 +385,7 @@ def checkdep_xmllint():
395385
stderr=subprocess.PIPE)
396386
for line in s.stderr:
397387
if b'version' in line:
398-
v = byte2str(line.split()[-1])
388+
v = line.split()[-1].decode('ascii')
399389
break
400390
return v
401391
except (IndexError, ValueError, UnboundLocalError, OSError):
@@ -771,7 +761,7 @@ class RcParams(dict):
771761
"""
772762

773763
validate = dict((key, converter) for key, (default, converter) in
774-
defaultParams.iteritems())
764+
six.iteritems(defaultParams))
775765
msg_depr = "%s is deprecated and replaced with %s; please use the latter."
776766
msg_depr_ignore = "%s is deprecated and ignored. Use %s"
777767

@@ -856,7 +846,7 @@ def rc_params(fail_on_error=False):
856846
# this should never happen, default in mpl-data should always be found
857847
message = 'could not find rc file; returning defaults'
858848
ret = RcParams([(key, default) for key, (default, _) in \
859-
defaultParams.iteritems() ])
849+
six.iteritems(defaultParams)])
860850
warnings.warn(message)
861851
return ret
862852

@@ -888,7 +878,7 @@ def rc_params_from_file(fname, fail_on_error=False):
888878
rc_temp[key] = (val, line, cnt)
889879

890880
ret = RcParams([(key, default) for key, (default, _) in \
891-
defaultParams.iteritems()])
881+
six.iteritems(defaultParams)])
892882

893883
for key in ('verbose.level', 'verbose.fileo'):
894884
if key in rc_temp:
@@ -904,7 +894,7 @@ def rc_params_from_file(fname, fail_on_error=False):
904894
verbose.set_level(ret['verbose.level'])
905895
verbose.set_fileo(ret['verbose.fileo'])
906896

907-
for key, (val, line, cnt) in rc_temp.iteritems():
897+
for key, (val, line, cnt) in six.iteritems(rc_temp):
908898
if key in defaultParams:
909899
if fail_on_error:
910900
ret[key] = val # try to convert to proper type or raise
@@ -960,8 +950,8 @@ def rc_params_from_file(fname, fail_on_error=False):
960950

961951
rcParamsOrig = rcParams.copy()
962952

963-
rcParamsDefault = RcParams([ (key, default) for key, (default, converter) in \
964-
defaultParams.iteritems() ])
953+
rcParamsDefault = RcParams([(key, default) for key, (default, converter) in \
954+
six.iteritems(defaultParams)])
965955

966956
rcParams['ps.usedistiller'] = checkdep_ps_distiller(rcParams['ps.usedistiller'])
967957
rcParams['text.usetex'] = checkdep_usetex(rcParams['text.usetex'])
@@ -1033,7 +1023,7 @@ def rc(group, **kwargs):
10331023
if is_string_like(group):
10341024
group = (group,)
10351025
for g in group:
1036-
for k,v in kwargs.iteritems():
1026+
for k, v in six.iteritems(kwargs):
10371027
name = aliases.get(k) or k
10381028
key = '%s.%s' % (g, name)
10391029
try:
@@ -1289,4 +1279,4 @@ def test(verbosity=1):
12891279
verbose.report('verbose.level %s'%verbose.level)
12901280
verbose.report('interactive is %s'%rcParams['interactive'])
12911281
verbose.report('platform is %s'%sys.platform)
1292-
verbose.report('loaded modules: %s'%sys.modules.iterkeys(), 'debug')
1282+
verbose.report('loaded modules: %s'%six.iterkeys(sys.modules), 'debug')

‎lib/matplotlib/_cm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Documentation for each is in pyplot.colormaps()
66
"""
77

8-
from __future__ import print_function, division
8+
from __future__ import absolute_import, division, print_function, unicode_literals
99
import numpy as np
1010

1111
_binary_data = {

‎lib/matplotlib/_mathtext_data.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"""
44
# this dict maps symbol names to fontnames, glyphindex. To get the
55
# glyph index from the character code, you have to use get_charmap
6-
from __future__ import print_function
6+
from __future__ import absolute_import, division, print_function, unicode_literals
7+
8+
import six
79

810
"""
911
from matplotlib.ft2font import FT2Font
@@ -88,7 +90,7 @@
8890
r'\rho' : ('cmmi10', 39),
8991
r'\sigma' : ('cmmi10', 21),
9092
r'\tau' : ('cmmi10', 43),
91-
r'\upsilon' : ('cmmi10', 25),
93+
'\\upsilon' : ('cmmi10', 25),
9294
r'\phi' : ('cmmi10', 42),
9395
r'\chi' : ('cmmi10', 17),
9496
r'\psi' : ('cmmi10', 31),
@@ -129,7 +131,7 @@
129131
r'\Xi' : ('cmr10', 3),
130132
r'\Pi' : ('cmr10', 17),
131133
r'\Sigma' : ('cmr10', 10),
132-
r'\Upsilon' : ('cmr10', 11),
134+
'\\Upsilon' : ('cmr10', 11),
133135
r'\Phi' : ('cmr10', 9),
134136
r'\Psi' : ('cmr10', 15),
135137
r'\Omega' : ('cmr10', 12),
@@ -149,15 +151,15 @@
149151
r'\combiningdotabove' : ('cmr10', 26), # for \dot
150152

151153
r'\leftarrow' : ('cmsy10', 10),
152-
r'\uparrow' : ('cmsy10', 25),
154+
'\\uparrow' : ('cmsy10', 25),
153155
r'\downarrow' : ('cmsy10', 28),
154156
r'\leftrightarrow' : ('cmsy10', 24),
155157
r'\nearrow' : ('cmsy10', 99),
156158
r'\searrow' : ('cmsy10', 57),
157159
r'\simeq' : ('cmsy10', 108),
158160
r'\Leftarrow' : ('cmsy10', 104),
159161
r'\Rightarrow' : ('cmsy10', 112),
160-
r'\Uparrow' : ('cmsy10', 60),
162+
'\\Uparrow' : ('cmsy10', 60),
161163
r'\Downarrow' : ('cmsy10', 68),
162164
r'\Leftrightarrow' : ('cmsy10', 51),
163165
r'\nwarrow' : ('cmsy10', 65),
@@ -180,7 +182,7 @@
180182
r'\aleph' : ('cmsy10', 26),
181183
r'\cup' : ('cmsy10', 6),
182184
r'\cap' : ('cmsy10', 19),
183-
r'\uplus' : ('cmsy10', 58),
185+
'\\uplus' : ('cmsy10', 58),
184186
r'\wedge' : ('cmsy10', 43),
185187
r'\vee' : ('cmsy10', 96),
186188
r'\vdash' : ('cmsy10', 109),
@@ -194,8 +196,8 @@
194196
r'\mid' : ('cmsy10', 47),
195197
r'\vert' : ('cmsy10', 47),
196198
r'\Vert' : ('cmsy10', 44),
197-
r'\updownarrow' : ('cmsy10', 94),
198-
r'\Updownarrow' : ('cmsy10', 53),
199+
'\\updownarrow' : ('cmsy10', 94),
200+
'\\Updownarrow' : ('cmsy10', 53),
199201
r'\backslash' : ('cmsy10', 126),
200202
r'\wr' : ('cmsy10', 101),
201203
r'\nabla' : ('cmsy10', 110),
@@ -296,7 +298,7 @@
296298
r'\rho' : ('psyr', 114),
297299
r'\sigma' : ('psyr', 115),
298300
r'\tau' : ('psyr', 116),
299-
r'\upsilon' : ('psyr', 117),
301+
'\\upsilon' : ('psyr', 117),
300302
r'\varpi' : ('psyr', 118),
301303
r'\omega' : ('psyr', 119),
302304
r'\xi' : ('psyr', 120),
@@ -311,7 +313,7 @@
311313
r'\spadesuit' : ('psyr', 170),
312314
r'\leftrightarrow' : ('psyr', 171),
313315
r'\leftarrow' : ('psyr', 172),
314-
r'\uparrow' : ('psyr', 173),
316+
'\\uparrow' : ('psyr', 173),
315317
r'\rightarrow' : ('psyr', 174),
316318
r'\downarrow' : ('psyr', 175),
317319
r'\pm' : ('psyr', 176),
@@ -350,12 +352,12 @@
350352
r'\surd' : ('psyr', 214),
351353
r'\__sqrt__' : ('psyr', 214),
352354
r'\cdot' : ('psyr', 215),
353-
r'\urcorner' : ('psyr', 216),
355+
'\\urcorner' : ('psyr', 216),
354356
r'\vee' : ('psyr', 217),
355357
r'\wedge' : ('psyr', 218),
356358
r'\Leftrightarrow' : ('psyr', 219),
357359
r'\Leftarrow' : ('psyr', 220),
358-
r'\Uparrow' : ('psyr', 221),
360+
'\\Uparrow' : ('psyr', 221),
359361
r'\Rightarrow' : ('psyr', 222),
360362
r'\Downarrow' : ('psyr', 223),
361363
r'\Diamond' : ('psyr', 224),
@@ -378,7 +380,7 @@
378380
r'\slash' : ('psyr', 0o57),
379381
r'\Lamda' : ('psyr', 0o114),
380382
r'\neg' : ('psyr', 0o330),
381-
r'\Upsilon' : ('psyr', 0o241),
383+
'\\Upsilon' : ('psyr', 0o241),
382384
r'\rightbrace' : ('psyr', 0o175),
383385
r'\rfloor' : ('psyr', 0o373),
384386
r'\lambda' : ('psyr', 0o154),
@@ -1764,7 +1766,7 @@
17641766
'uni044B' : 1099
17651767
}
17661768

1767-
uni2type1 = dict(((v,k) for k,v in type12uni.iteritems()))
1769+
uni2type1 = dict(((v,k) for k,v in six.iteritems(type12uni)))
17681770

17691771
tex2uni = {
17701772
'widehat' : 0x0302,

‎lib/matplotlib/_pylab_helpers.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
"""
22
Manage figures for pyplot interface.
33
"""
4-
from __future__ import print_function
4+
from __future__ import absolute_import, division, print_function, unicode_literals
5+
6+
import six
57

68
import sys, gc
79

@@ -72,7 +74,7 @@ def destroy(num):
7274
def destroy_fig(fig):
7375
"*fig* is a Figure instance"
7476
num = None
75-
for manager in Gcf.figs.itervalues():
77+
for manager in six.itervalues(Gcf.figs):
7678
if manager.canvas.figure == fig:
7779
num = manager.num
7880
break
@@ -81,7 +83,7 @@ def destroy_fig(fig):
8183

8284
@staticmethod
8385
def destroy_all():
84-
for manager in Gcf.figs.values():
86+
for manager in list(Gcf.figs.values()):
8587
manager.canvas.mpl_disconnect(manager._cidgcf)
8688
manager.destroy()
8789

@@ -101,7 +103,7 @@ def get_all_fig_managers():
101103
"""
102104
Return a list of figure managers.
103105
"""
104-
return Gcf.figs.values()
106+
return list(Gcf.figs.values())
105107

106108
@staticmethod
107109
def get_num_fig_managers():
@@ -133,6 +135,3 @@ def set_active(manager):
133135

134136

135137
atexit.register(Gcf.destroy_all)
136-
137-
138-

0 commit comments

Comments
 (0)