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

Skip to content

Commit 0658343

Browse files
tacaswelltacaswell
authored
Merge pull request #6556 from matthew-brett/backport-revert-six-vendor
MRG: revert vendoring of six
2 parents 46920ad + 06b71fb commit 0658343

230 files changed

Lines changed: 330 additions & 1150 deletions

File tree

Some content is hidden

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

‎boilerplate.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from __future__ import (absolute_import, division, print_function,
2121
unicode_literals)
2222

23-
from matplotlib.externals import six
23+
import six
2424

2525
import os
2626
import inspect

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from __future__ import (absolute_import, division, print_function,
33
unicode_literals)
44

5-
from matplotlib.externals import six
5+
import six
66

77
import matplotlib as mpl
88
mpl.use("pgf")

‎lib/matplotlib/__init__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
from __future__ import (absolute_import, division, print_function,
103103
unicode_literals)
104104

105-
from matplotlib.externals import six
105+
import six
106106
import sys
107107
import distutils.version
108108
from itertools import chain
@@ -126,8 +126,8 @@
126126
cycler)
127127

128128
import numpy
129-
from matplotlib.externals.six.moves.urllib.request import urlopen
130-
from matplotlib.externals.six.moves import reload_module as reload
129+
from six.moves.urllib.request import urlopen
130+
from six.moves import reload_module as reload
131131

132132
# Get the version from the _version.py versioneer file. For a git checkout,
133133
# this is computed based on the number of commits since the last tag.

‎lib/matplotlib/_color_data.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
33

4-
from matplotlib.externals import six
4+
import six
55

66

77
BASE_COLORS = {

‎lib/matplotlib/_mathtext_data.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from __future__ import (absolute_import, division, print_function,
55
unicode_literals)
66

7-
from matplotlib.externals import six
7+
import six
88

99
latex_to_bakoma = {
1010
'\\__sqrt__' : ('cmex10', 0x70),

‎lib/matplotlib/_pylab_helpers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from __future__ import (absolute_import, division, print_function,
55
unicode_literals)
66

7-
from matplotlib.externals import six
7+
import six
88
import sys
99
import gc
1010
import atexit

‎lib/matplotlib/afm.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
from __future__ import (absolute_import, division, print_function,
3737
unicode_literals)
3838

39-
from matplotlib.externals import six
40-
from matplotlib.externals.six.moves import map
39+
import six
40+
from six.moves import map
4141

4242
import sys
4343
import os

‎lib/matplotlib/animation.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
from __future__ import (absolute_import, division, print_function,
2121
unicode_literals)
2222

23-
from matplotlib.externals import six
24-
from matplotlib.externals.six.moves import xrange, zip
23+
import six
24+
from six.moves import xrange, zip
2525

2626
import os
2727
import platform
@@ -569,7 +569,7 @@ def output_args(self):
569569
def _init_from_registry(cls):
570570
if sys.platform != 'win32' or rcParams[cls.exec_key] != 'convert':
571571
return
572-
from matplotlib.externals.six.moves import winreg
572+
from six.moves import winreg
573573
for flag in (0, winreg.KEY_WOW64_32KEY, winreg.KEY_WOW64_64KEY):
574574
try:
575575
hkey = winreg.OpenKeyEx(winreg.HKEY_LOCAL_MACHINE,

‎lib/matplotlib/artist.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
33

4-
from matplotlib.externals import six
4+
import six
55
from collections import OrderedDict
66

77
import re

‎lib/matplotlib/axes/_axes.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from __future__ import (absolute_import, division, print_function,
22
unicode_literals)
33

4-
from matplotlib.externals import six
5-
from matplotlib.externals.six.moves import reduce, xrange, zip, zip_longest
4+
import six
5+
from six.moves import reduce, xrange, zip, zip_longest
66

77
import itertools
88
import math

0 commit comments

Comments
 (0)