Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 06b71fb

Browse filesBrowse files
matthew-brettmatthew-brett
committed
BF: remove remaining matplotlib.externals.six refs
References remaining after reverting original change.
1 parent 07e2275 commit 06b71fb
Copy full SHA for 06b71fb

File tree

Expand file treeCollapse file tree

8 files changed

+9
-9
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+9
-9
lines changed

‎boilerplate.py

Copy file name to clipboardExpand all lines: boilerplate.py
+1-1Lines 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

Copy file name to clipboardExpand all lines: doc/users/plotting/examples/pgf_preamble.py
+1-1Lines 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/_color_data.py

Copy file name to clipboardExpand all lines: lib/matplotlib/_color_data.py
+1-1Lines 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/animation.py

Copy file name to clipboardExpand all lines: lib/matplotlib/animation.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/backends/backend_svg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_svg.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from collections import OrderedDict
55

66
import six
7-
from ix.moves import xrange
8-
from matplotlib.externals.six import unichr
7+
from six import unichr
8+
from six.moves import xrange
99

1010
import os, base64, tempfile, gzip, io, sys, codecs, re
1111

‎lib/matplotlib/testing/disable_internet.py

Copy file name to clipboardExpand all lines: lib/matplotlib/testing/disable_internet.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import contextlib
88
import socket
99

10-
from matplotlib.externals.six.moves import urllib
10+
from six.moves import urllib
1111

1212
# save original socket method for restoration
1313
# These are global so that re-calling the turn_off_internet function doesn't

‎lib/matplotlib/tests/test_container.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_container.py
+1-1Lines 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
import matplotlib.pyplot as plt
66

77
from matplotlib.testing.decorators import cleanup

‎lib/matplotlib/tests/test_type1font.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_type1font.py
+1-1Lines 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
from nose.tools import assert_equal, assert_in
77
import matplotlib.type1font as t1f

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.