Revision: 4017
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4017&view=rev
Author: mdboom
Date: 2007-10-26 11:00:23 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
Removed unused imports.
Modified Paths:
--------------
branches/transforms/lib/matplotlib/_mathtext_data.py
branches/transforms/lib/matplotlib/art3d.py
branches/transforms/lib/matplotlib/artist.py
branches/transforms/lib/matplotlib/axes.py
branches/transforms/lib/matplotlib/axes3d.py
branches/transforms/lib/matplotlib/axis.py
branches/transforms/lib/matplotlib/backend_bases.py
branches/transforms/lib/matplotlib/collections.py
branches/transforms/lib/matplotlib/colorbar.py
branches/transforms/lib/matplotlib/colors.py
branches/transforms/lib/matplotlib/contour.py
branches/transforms/lib/matplotlib/dates.py
branches/transforms/lib/matplotlib/figure.py
branches/transforms/lib/matplotlib/finance.py
branches/transforms/lib/matplotlib/font_manager.py
branches/transforms/lib/matplotlib/fontconfig_pattern.py
branches/transforms/lib/matplotlib/image.py
branches/transforms/lib/matplotlib/legend.py
branches/transforms/lib/matplotlib/lines.py
branches/transforms/lib/matplotlib/mathtext.py
branches/transforms/lib/matplotlib/mlab.py
branches/transforms/lib/matplotlib/patches.py
branches/transforms/lib/matplotlib/proj3d.py
branches/transforms/lib/matplotlib/scale.py
branches/transforms/lib/matplotlib/table.py
branches/transforms/lib/matplotlib/texmanager.py
branches/transforms/lib/matplotlib/text.py
branches/transforms/lib/matplotlib/ticker.py
branches/transforms/lib/matplotlib/units.py
Modified: branches/transforms/lib/matplotlib/_mathtext_data.py
===================================================================
--- branches/transforms/lib/matplotlib/_mathtext_data.py 2007-10-26
17:57:02 UTC (rev 4016)
+++ branches/transforms/lib/matplotlib/_mathtext_data.py 2007-10-26
18:00:23 UTC (rev 4017)
@@ -14,8 +14,6 @@
print charcode, glyphind
"""
-from sets import Set
-
latex_to_bakoma = {
r'\oint' : ('cmex10', 45),
r'\bigodot' : ('cmex10', 50),
Modified: branches/transforms/lib/matplotlib/art3d.py
===================================================================
--- branches/transforms/lib/matplotlib/art3d.py 2007-10-26 17:57:02 UTC (rev
4016)
+++ branches/transforms/lib/matplotlib/art3d.py 2007-10-26 18:00:23 UTC (rev
4017)
@@ -10,7 +10,6 @@
import text
from colors import Normalize
-from cm import jet
import numpy as npy
import proj3d
Modified: branches/transforms/lib/matplotlib/artist.py
===================================================================
--- branches/transforms/lib/matplotlib/artist.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/artist.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -1,9 +1,7 @@
from __future__ import division
-import sys, re, warnings
+import re, warnings
from cbook import iterable, flatten
-from transforms import Affine2D, Bbox, IdentityTransform, TransformedBbox, \
- TransformedPath
-import matplotlib.units as units
+from transforms import Bbox, IdentityTransform, TransformedBbox,
TransformedPath
## Note, matplotlib artists use the doc strings for set and get
# methods to enable the introspection methods of setp and getp. Every
Modified: branches/transforms/lib/matplotlib/axes.py
===================================================================
--- branches/transforms/lib/matplotlib/axes.py 2007-10-26 17:57:02 UTC (rev
4016)
+++ branches/transforms/lib/matplotlib/axes.py 2007-10-26 18:00:23 UTC (rev
4017)
@@ -1,5 +1,5 @@
from __future__ import division, generators
-import math, sys, warnings, copy, new
+import math, warnings, new
import numpy as npy
@@ -9,7 +9,6 @@
rcParams = matplotlib.rcParams
from matplotlib import artist as martist
-from matplotlib import agg
from matplotlib import axis as maxis
from matplotlib import cbook
from matplotlib import collections as mcoll
@@ -21,9 +20,7 @@
from matplotlib import legend as mlegend
from matplotlib import lines as mlines
from matplotlib import mlab
-from matplotlib import cm
from matplotlib import patches as mpatches
-from matplotlib import path as mpath
from matplotlib import quiver as mquiver
from matplotlib import scale as mscale
from matplotlib import table as mtable
Modified: branches/transforms/lib/matplotlib/axes3d.py
===================================================================
--- branches/transforms/lib/matplotlib/axes3d.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/axes3d.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -11,12 +11,10 @@
import random
-import matplotlib
from axes import Axes
import cbook
from transforms import unit_bbox
-import figure
import numpy as npy
from colors import Normalize
Modified: branches/transforms/lib/matplotlib/axis.py
===================================================================
--- branches/transforms/lib/matplotlib/axis.py 2007-10-26 17:57:02 UTC (rev
4016)
+++ branches/transforms/lib/matplotlib/axis.py 2007-10-26 18:00:23 UTC (rev
4017)
@@ -2,23 +2,19 @@
Classes for the ticks and x and y axis
"""
from __future__ import division
-import copy
-import math
-import re
-import sys
from artist import Artist, setp
from cbook import enumerate, silent_list, popall, CallbackRegistry
from lines import Line2D, TICKLEFT, TICKRIGHT, TICKUP, TICKDOWN
from matplotlib import rcParams
from patches import bbox_artist
-from ticker import NullFormatter, FixedFormatter, ScalarFormatter,
LogFormatter, LogFormatterMathtext
-from ticker import NullLocator, FixedLocator, LinearLocator, LogLocator,
AutoLocator
+from ticker import NullFormatter, FixedFormatter, ScalarFormatter
+from ticker import NullLocator, FixedLocator, AutoLocator
from font_manager import FontProperties
-from text import Text, TextWithDash, _process_text_args
-from transforms import Affine2D, Bbox, blended_transform_factory,
interval_contains, \
- interval_contains_open, IdentityTransform
+from text import Text, TextWithDash
+from transforms import Affine2D, Bbox, blended_transform_factory, \
+ interval_contains
from patches import bbox_artist
from scale import scale_factory
Modified: branches/transforms/lib/matplotlib/backend_bases.py
===================================================================
--- branches/transforms/lib/matplotlib/backend_bases.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/backend_bases.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -4,10 +4,9 @@
"""
from __future__ import division
-import os, sys, warnings, copy, weakref
+import os
import numpy as npy
-import matplotlib.numerix.npyma as ma
import matplotlib.cbook as cbook
import matplotlib.colors as colors
import matplotlib.transforms as transforms
Modified: branches/transforms/lib/matplotlib/collections.py
===================================================================
--- branches/transforms/lib/matplotlib/collections.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/collections.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -16,7 +16,6 @@
import matplotlib.transforms as transforms
import matplotlib.artist as artist
import matplotlib.backend_bases as backend_bases
-import matplotlib.nxutils as nxutils
import matplotlib.path as path
class Collection(artist.Artist, cm.ScalarMappable):
Modified: branches/transforms/lib/matplotlib/colorbar.py
===================================================================
--- branches/transforms/lib/matplotlib/colorbar.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/colorbar.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -21,7 +21,6 @@
import matplotlib.cm as cm
import matplotlib.ticker as ticker
import matplotlib.cbook as cbook
-import matplotlib.transforms as transforms
import matplotlib.lines as lines
import matplotlib.patches as patches
import matplotlib.collections as collections
Modified: branches/transforms/lib/matplotlib/colors.py
===================================================================
--- branches/transforms/lib/matplotlib/colors.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/colors.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -34,7 +34,6 @@
'chartreuse' are supported.
"""
import re
-import warnings
import numpy as npy
import matplotlib.numerix.npyma as ma
import matplotlib.cbook as cbook
Modified: branches/transforms/lib/matplotlib/contour.py
===================================================================
--- branches/transforms/lib/matplotlib/contour.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/contour.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -10,7 +10,6 @@
import matplotlib._cntr as _cntr
import matplotlib.path as path
import matplotlib.ticker as ticker
-import matplotlib.transforms as transforms
import matplotlib.cm as cm
import matplotlib.colors as colors
import matplotlib.collections as collections
Modified: branches/transforms/lib/matplotlib/dates.py
===================================================================
--- branches/transforms/lib/matplotlib/dates.py 2007-10-26 17:57:02 UTC (rev
4016)
+++ branches/transforms/lib/matplotlib/dates.py 2007-10-26 18:00:23 UTC (rev
4017)
@@ -76,8 +76,7 @@
DateIndexFormatter - date plots with implicit x indexing.
"""
-import sys, re, time, math, datetime
-import locale
+import re, time, math, datetime
import pytz
import matplotlib
Modified: branches/transforms/lib/matplotlib/figure.py
===================================================================
--- branches/transforms/lib/matplotlib/figure.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/figure.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -1,8 +1,6 @@
"""
Figure class -- add docstring here!
"""
-import sys
-
import numpy as npy
import artist
@@ -11,20 +9,15 @@
from cbook import flatten, allequal, Stack, iterable, dedent
import _image
import colorbar as cbar
-from colors import Normalize, rgb2hex
from image import FigureImage
from matplotlib import rcParams
-from patches import Rectangle, Polygon
+from patches import Rectangle
from text import Text, _process_text_args
from legend import Legend
-from ticker import FormatStrFormatter
from transforms import Affine2D, Bbox, BboxTransformTo, TransformedBbox
-from cm import ScalarMappable
-from contour import ContourSet
from projections import projection_factory, get_projection_names, \
get_projection_class
-import warnings
class SubplotParams:
"""
Modified: branches/transforms/lib/matplotlib/finance.py
===================================================================
--- branches/transforms/lib/matplotlib/finance.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/finance.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -15,8 +15,7 @@
import numpy as npy
from matplotlib import verbose, get_configdir
-from artist import Artist
-from dates import date2num, num2date
+from dates import date2num
from matplotlib.cbook import Bunch
from matplotlib.collections import LineCollection, PolyCollection
from matplotlib.colors import colorConverter
Modified: branches/transforms/lib/matplotlib/font_manager.py
===================================================================
--- branches/transforms/lib/matplotlib/font_manager.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/font_manager.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -33,12 +33,12 @@
see license/LICENSE_TTFQUERY.
"""
-import os, sys, glob, shutil
+import os, sys, glob
from sets import Set
import matplotlib
from matplotlib import afm
from matplotlib import ft2font
-from matplotlib import rcParams, get_home, get_configdir
+from matplotlib import rcParams, get_configdir
from matplotlib.cbook import is_string_like
from matplotlib.fontconfig_pattern import \
parse_fontconfig_pattern, generate_fontconfig_pattern
Modified: branches/transforms/lib/matplotlib/fontconfig_pattern.py
===================================================================
--- branches/transforms/lib/matplotlib/fontconfig_pattern.py 2007-10-26
17:57:02 UTC (rev 4016)
+++ branches/transforms/lib/matplotlib/fontconfig_pattern.py 2007-10-26
18:00:23 UTC (rev 4017)
@@ -18,7 +18,7 @@
License : matplotlib license (PSF compatible)
"""
import re
-from matplotlib.pyparsing import Literal, OneOrMore, ZeroOrMore, \
+from matplotlib.pyparsing import Literal, ZeroOrMore, \
Optional, Regex, StringEnd, ParseException, Suppress
family_punc = r'\\\-:,'
Modified: branches/transforms/lib/matplotlib/image.py
===================================================================
--- branches/transforms/lib/matplotlib/image.py 2007-10-26 17:57:02 UTC (rev
4016)
+++ branches/transforms/lib/matplotlib/image.py 2007-10-26 18:00:23 UTC (rev
4017)
@@ -4,7 +4,7 @@
"""
from __future__ import division
-import sys, os
+import os
import numpy as npy
import numerix.ma as ma
Modified: branches/transforms/lib/matplotlib/legend.py
===================================================================
--- branches/transforms/lib/matplotlib/legend.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/legend.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -21,17 +21,17 @@
up the legend
"""
from __future__ import division
-import copy, sys, warnings
+import warnings
import numpy as npy
-from matplotlib import verbose, rcParams
+from matplotlib import rcParams
from artist import Artist
-from cbook import enumerate, is_string_like, iterable, silent_list
+from cbook import is_string_like, iterable, silent_list
from font_manager import FontProperties
from lines import Line2D
from mlab import segments_intersect
-from patches import Patch, Rectangle, RegularPolygon, Shadow, bbox_artist,
draw_bbox
+from patches import Patch, Rectangle, Shadow, bbox_artist
from collections import LineCollection, RegularPolyCollection
from text import Text
from transforms import Affine2D, Bbox, BboxTransformTo
Modified: branches/transforms/lib/matplotlib/lines.py
===================================================================
--- branches/transforms/lib/matplotlib/lines.py 2007-10-26 17:57:02 UTC (rev
4016)
+++ branches/transforms/lib/matplotlib/lines.py 2007-10-26 18:00:23 UTC (rev
4017)
@@ -6,14 +6,12 @@
# TODO: expose cap and join style attrs
from __future__ import division
-import sys, math, warnings
-
import numpy as npy
import numerix.ma as ma
from matplotlib import verbose
import artist
-from artist import Artist, setp
+from artist import Artist
from cbook import iterable, is_string_like, is_numlike
from colors import colorConverter
from path import Path
Modified: branches/transforms/lib/matplotlib/mathtext.py
===================================================================
--- branches/transforms/lib/matplotlib/mathtext.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/mathtext.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -124,29 +124,27 @@
"""
from __future__ import division
-import os, sys
+import os
from cStringIO import StringIO
-from math import floor, ceil
+from math import ceil
from sets import Set
import unicodedata
from warnings import warn
from numpy import inf, isinf
-from matplotlib import verbose
-from matplotlib.pyparsing import Literal, Word, OneOrMore, ZeroOrMore, \
- Combine, Group, Optional, Forward, NotAny, alphas, nums, alphanums, \
- StringStart, StringEnd, ParseFatalException, FollowedBy, Regex, \
- operatorPrecedence, opAssoc, ParseResults, Or, Suppress, oneOf, \
- ParseException, MatchFirst, NoMatch, Empty
+from matplotlib.pyparsing import Combine, Group, Optional, Forward, \
+ Literal, OneOrMore, ZeroOrMore, ParseException, Empty, \
+ ParseResults, Suppress, oneOf, StringEnd, ParseFatalException, \
+ FollowedBy, Regex
from matplotlib.afm import AFM
-from matplotlib.cbook import enumerate, iterable, Bunch,
get_realpath_and_stat, \
+from matplotlib.cbook import Bunch, get_realpath_and_stat, \
is_string_like
from matplotlib.ft2font import FT2Font, FT2Image, KERNING_DEFAULT,
LOAD_DEFAULT, LOAD_NO_HINTING
from matplotlib.font_manager import findfont, FontProperties
from matplotlib._mathtext_data import latex_to_bakoma, \
- latex_to_standard, tex2uni, type12uni, tex2type1, uni2type1, \
+ latex_to_standard, tex2uni, tex2type1, uni2type1, \
latex_to_cmex
from matplotlib import get_data_path, rcParams
Modified: branches/transforms/lib/matplotlib/mlab.py
===================================================================
--- branches/transforms/lib/matplotlib/mlab.py 2007-10-26 17:57:02 UTC (rev
4016)
+++ branches/transforms/lib/matplotlib/mlab.py 2007-10-26 18:00:23 UTC (rev
4017)
@@ -55,7 +55,7 @@
"""
from __future__ import division
-import sys, datetime, csv, warnings
+import csv, warnings
import numpy as npy
Modified: branches/transforms/lib/matplotlib/patches.py
===================================================================
--- branches/transforms/lib/matplotlib/patches.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/patches.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -6,10 +6,7 @@
import matplotlib.cbook as cbook
import matplotlib.artist as artist
import matplotlib.colors as colors
-import matplotlib.lines as lines
import matplotlib.transforms as transforms
-import matplotlib.nxutils as nxutils
-import matplotlib.mlab as mlab
import matplotlib.artist as artist
from matplotlib.path import Path
Modified: branches/transforms/lib/matplotlib/proj3d.py
===================================================================
--- branches/transforms/lib/matplotlib/proj3d.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/proj3d.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -9,7 +9,6 @@
from patches import Circle
import numpy as npy
import numpy.linalg as linalg
-from math import sqrt
def _hide_cross(a,b):
"""
Modified: branches/transforms/lib/matplotlib/scale.py
===================================================================
--- branches/transforms/lib/matplotlib/scale.py 2007-10-26 17:57:02 UTC (rev
4016)
+++ branches/transforms/lib/matplotlib/scale.py 2007-10-26 18:00:23 UTC (rev
4017)
@@ -1,12 +1,9 @@
import numpy as npy
from numpy import ma
-from numpy.linalg import inv
-from ticker import NullFormatter, FixedFormatter, ScalarFormatter, \
- LogFormatter, LogFormatterMathtext
-from ticker import NullLocator, FixedLocator, LinearLocator, LogLocator, \
- AutoLocator
-from transforms import Transform, composite_transform_factory,
IdentityTransform
+from ticker import NullFormatter, ScalarFormatter, LogFormatterMathtext
+from ticker import NullLocator, LogLocator, AutoLocator
+from transforms import Transform, IdentityTransform
class ScaleBase(object):
def set_default_locators_and_formatters(self, axis):
Modified: branches/transforms/lib/matplotlib/table.py
===================================================================
--- branches/transforms/lib/matplotlib/table.py 2007-10-26 17:57:02 UTC (rev
4016)
+++ branches/transforms/lib/matplotlib/table.py 2007-10-26 18:00:23 UTC (rev
4017)
@@ -20,14 +20,12 @@
"""
from __future__ import division
-import sys, warnings
+import warnings
-from matplotlib import verbose
-
import artist
from artist import Artist
from patches import Rectangle
-from cbook import enumerate, is_string_like, flatten
+from cbook import is_string_like
from text import Text
from transforms import Bbox
Modified: branches/transforms/lib/matplotlib/texmanager.py
===================================================================
--- branches/transforms/lib/matplotlib/texmanager.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/texmanager.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -33,7 +33,7 @@
"""
-import copy, glob, md5, os, shutil, sys, warnings
+import copy, glob, md5, os, shutil, sys
import numpy as npy
import matplotlib as mpl
from matplotlib import rcParams
Modified: branches/transforms/lib/matplotlib/text.py
===================================================================
--- branches/transforms/lib/matplotlib/text.py 2007-10-26 17:57:02 UTC (rev
4016)
+++ branches/transforms/lib/matplotlib/text.py 2007-10-26 18:00:23 UTC (rev
4017)
@@ -2,17 +2,15 @@
Figure and Axes text
"""
from __future__ import division
-import re, math
+import math
import numpy as npy
-import matplotlib
-from matplotlib import verbose
from matplotlib import cbook
from matplotlib import rcParams
import artist
from artist import Artist
-from cbook import enumerate, is_string_like, maxdict, is_numlike
+from cbook import enumerate, is_string_like, maxdict
from font_manager import FontProperties
from patches import bbox_artist, YAArrow
from transforms import Affine2D, Bbox
Modified: branches/transforms/lib/matplotlib/ticker.py
===================================================================
--- branches/transforms/lib/matplotlib/ticker.py 2007-10-26 17:57:02 UTC
(rev 4016)
+++ branches/transforms/lib/matplotlib/ticker.py 2007-10-26 18:00:23 UTC
(rev 4017)
@@ -104,10 +104,9 @@
from __future__ import division
-import sys, os, re, time, math, warnings
+import math
import numpy as npy
-import matplotlib as mpl
-from matplotlib import verbose, rcParams
+from matplotlib import rcParams
from matplotlib import cbook
from matplotlib import transforms as mtransforms
Modified: branches/transforms/lib/matplotlib/units.py
===================================================================
--- branches/transforms/lib/matplotlib/units.py 2007-10-26 17:57:02 UTC (rev
4016)
+++ branches/transforms/lib/matplotlib/units.py 2007-10-26 18:00:23 UTC (rev
4017)
@@ -43,7 +43,6 @@
units.registry[datetime.date] = DateConverter()
"""
-import matplotlib
from matplotlib.cbook import iterable, is_numlike
class AxisInfo:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
