From 788f130cecd844503c7731710b63c73bed37b0ff Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 9 Jun 2014 08:47:44 -0400 Subject: [PATCH 1/2] DOC : sixify unichr closes #3117 --- examples/pylab_examples/font_table_ttf.py | 7 ++----- lib/matplotlib/backends/backend_pdf.py | 2 +- lib/matplotlib/backends/backend_qt4.py | 2 +- lib/matplotlib/backends/backend_svg.py | 3 +-- lib/matplotlib/mathtext.py | 3 +-- lib/matplotlib/tests/test_backend_qt4.py | 2 +- lib/matplotlib/type1font.py | 3 +-- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/examples/pylab_examples/font_table_ttf.py b/examples/pylab_examples/font_table_ttf.py index e475d332bb25..fbe5dc1fc985 100755 --- a/examples/pylab_examples/font_table_ttf.py +++ b/examples/pylab_examples/font_table_ttf.py @@ -16,11 +16,8 @@ from matplotlib.font_manager import FontProperties from pylab import figure, table, show, axis, title -try: - unichr -except NameError: - # Python 3 - unichr = chr +import six +from six import unichr # the font table grid diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index 4840ead4b572..2a5b0184406f 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -19,10 +19,10 @@ import zlib import numpy as np +from six import unichr if six.PY3: from io import BytesIO - unichr = chr else: from cStringIO import StringIO as BytesIO from datetime import datetime diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py index 70152aac9f47..56cb9101a547 100644 --- a/lib/matplotlib/backends/backend_qt4.py +++ b/lib/matplotlib/backends/backend_qt4.py @@ -2,7 +2,7 @@ unicode_literals) import six - +from six import unichr import os import re import signal diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py index 8cd1682527cb..89e4d5986fb8 100644 --- a/lib/matplotlib/backends/backend_svg.py +++ b/lib/matplotlib/backends/backend_svg.py @@ -3,8 +3,7 @@ import six from six.moves import xrange -if six.PY3: - unichr = chr +from six import unichr import os, base64, tempfile, gzip, io, sys, codecs, re diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py index c8c8f7d8b0d5..388e209ec32f 100644 --- a/lib/matplotlib/mathtext.py +++ b/lib/matplotlib/mathtext.py @@ -23,8 +23,7 @@ import six import os, sys -if six.PY3: - unichr = chr +from six import unichr from math import ceil try: set diff --git a/lib/matplotlib/tests/test_backend_qt4.py b/lib/matplotlib/tests/test_backend_qt4.py index 93e2c657a133..5d7fb0593a8f 100644 --- a/lib/matplotlib/tests/test_backend_qt4.py +++ b/lib/matplotlib/tests/test_backend_qt4.py @@ -2,7 +2,7 @@ unicode_literals) import six - +from six import unichr from matplotlib import pyplot as plt from matplotlib.testing.decorators import cleanup from matplotlib.testing.decorators import knownfailureif diff --git a/lib/matplotlib/type1font.py b/lib/matplotlib/type1font.py index f4cc555c638a..fd4bdb97ed61 100644 --- a/lib/matplotlib/type1font.py +++ b/lib/matplotlib/type1font.py @@ -27,8 +27,7 @@ import six from six.moves import filter -if six.PY3: - unichr = chr +from six import unichr import io import itertools From 03435f4868775cc23ba66332768e8285f3d1e980 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Tue, 10 Jun 2014 08:20:09 -0400 Subject: [PATCH 2/2] MNT : six-ified BytesIO import in pdf backend --- lib/matplotlib/backends/backend_pdf.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index 2a5b0184406f..49350e4fdda3 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -20,11 +20,8 @@ import numpy as np from six import unichr +from six import BytesIO -if six.PY3: - from io import BytesIO -else: - from cStringIO import StringIO as BytesIO from datetime import datetime from math import ceil, cos, floor, pi, sin try: pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy