175,187d174
<                 pkg_dir, mod_file = os.path.split(mod.__file__)
<                 mod_name, ext = os.path.splitext(mod_file)
<
<                 rel_pkg = os.path.relpath(pkg_dir, os.path.dirname(__file__))
<                 pkg_import = rel_pkg.replace(os.path.sep, '.')
<
<                 if mod_name == '__init__':
<                     mod_import = 'from ' + '.' + pkg_import
<                 else:
<                     mod_import = 'from ' + '.' + pkg_import + '.' + mod_name
<
<                 print mod_import, 'import', k
<
190,318c177,178
< #importAll('graphicsItems', globals(), locals())
< #importAll('widgets', globals(), locals(), excludes=['MatplotlibWidget', 'RemoteGraphicsView'])
<
< from .graphicsItems.ArrowItem import ArrowItem
< from .graphicsItems.GraphicsWidgetAnchor import GraphicsWidgetAnchor
< from .graphicsItems.GraphicsWidgetAnchor import Point
< from .graphicsItems.GraphicsWidgetAnchor import QtCore
< from .graphicsItems.GraphicsWidgetAnchor import QtGui
< from .graphicsItems.ROI import ROI
< from .graphicsItems.ROI import TestROI
< from .graphicsItems.ROI import RectROI
< from .graphicsItems.ROI import EllipseROI
< from .graphicsItems.ROI import CircleROI
< from .graphicsItems.ROI import PolygonROI
< from .graphicsItems.ROI import LineROI
< from .graphicsItems.ROI import MultiLineROI
< from .graphicsItems.ROI import MultiRectROI
< from .graphicsItems.ROI import LineSegmentROI
< from .graphicsItems.ROI import PolyLineROI
< from .graphicsItems.ROI import SpiralROI
< from .graphicsItems.UIGraphicsItem import UIGraphicsItem
< from .graphicsItems.LabelItem import LabelItem
< from .graphicsItems.FillBetweenItem import FillBetweenItem
< from .graphicsItems.FillBetweenItem import pg
< from .graphicsItems.PlotCurveItem import PlotCurveItem
< from .graphicsItems.LegendItem import LegendItem
< from .graphicsItems.GraphicsItem import FiniteCache
< from .graphicsItems.GraphicsItem import GraphicsItem
< from .graphicsItems.GraphicsItem import GraphicsScene
< from .graphicsItems.GraphicsItem import OrderedDict
< from .graphicsItems.GraphicsItem import Point
< from .graphicsItems.GraphicsItem import QtCore
< from .graphicsItems.GraphicsItem import QtGui
< from .graphicsItems.GraphicsItem import fn
< from .graphicsItems.GraphicsItem import operator
< from .graphicsItems.GraphicsItem import sys
< from .graphicsItems.GraphicsItem import weakref
< from .graphicsItems.IsocurveItem import GraphicsObject
< from .graphicsItems.IsocurveItem import IsocurveItem
< from .graphicsItems.IsocurveItem import QtCore
< from .graphicsItems.IsocurveItem import QtGui
< from .graphicsItems.IsocurveItem import fn
< from .graphicsItems.GraphItem import GraphItem
< from .graphicsItems.GraphicsWidget import GraphicsWidget
< from .graphicsItems.GradientEditorItem import TickSliderItem
< from .graphicsItems.GradientEditorItem import GradientEditorItem
< from .graphicsItems.ScaleBar import ScaleBar
< from .graphicsItems.ErrorBarItem import ErrorBarItem
< from .graphicsItems.ButtonItem import ButtonItem
< from .graphicsItems.InfiniteLine import InfiniteLine
< from .graphicsItems.TextItem import QtCore
< from .graphicsItems.TextItem import QtGui
< from .graphicsItems.TextItem import TextItem
< from .graphicsItems.TextItem import UIGraphicsItem
< from .graphicsItems.TextItem import fn
< from .graphicsItems.TextItem import pg
< from .graphicsItems.ScatterPlotItem import ScatterPlotItem
< from .graphicsItems.ScatterPlotItem import SpotItem
< from .graphicsItems.VTickGroup import VTickGroup
< from .graphicsItems.AxisItem import AxisItem
< from .graphicsItems.ItemGroup import ItemGroup
< from .graphicsItems.MultiPlotItem import MultiPlotItem
< from .graphicsItems.PlotDataItem import GraphicsObject
< from .graphicsItems.PlotDataItem import PlotCurveItem
< from .graphicsItems.PlotDataItem import PlotDataItem
< from .graphicsItems.PlotDataItem import QtCore
< from .graphicsItems.PlotDataItem import ScatterPlotItem
< from .graphicsItems.PlotDataItem import dataType
< from .graphicsItems.PlotDataItem import debug
< from .graphicsItems.PlotDataItem import fn
< from .graphicsItems.PlotDataItem import isSequence
< from .graphicsItems.PlotDataItem import metaarray
< from .graphicsItems.PlotDataItem import np
< from .graphicsItems.PlotDataItem import pg
< from .graphicsItems.PlotDataItem import scipy
< from .graphicsItems.GridItem import GridItem
< from .graphicsItems.GraphicsObject import GraphicsObject
< from .graphicsItems.CurvePoint import CurvePoint
< from .graphicsItems.CurvePoint import CurveArrow
< from .graphicsItems.LinearRegionItem import LinearRegionItem
< from .graphicsItems.GradientLegend import GradientLegend
< from .graphicsItems.HistogramLUTItem import HistogramLUTItem
< from .graphicsItems.ImageItem import ImageItem
< from .graphicsItems.GraphicsLayout import GraphicsLayout
< from .graphicsItems.ViewBox import ViewBox
< from .graphicsItems.ViewBox import ViewBoxMenu
< from .graphicsItems.ViewBox import axisCtrlTemplate_pyqt
< from .graphicsItems.PlotItem import PlotItem
< from .graphicsItems.PlotItem import plotConfigTemplate_pyqt
< from .widgets.ProgressDialog import ProgressDialog
< from .widgets.BusyCursor import BusyCursor
< from .widgets.ColorButton import ColorButton
< from .widgets.ValueLabel import ValueLabel
< from .widgets.RawImageWidget import HAVE_OPENGL
< from .widgets.RawImageWidget import QtCore
< from .widgets.RawImageWidget import QtGui
< from .widgets.RawImageWidget import QtOpenGL
< from .widgets.RawImageWidget import RawImageGLWidget
< from .widgets.RawImageWidget import RawImageWidget
< from .widgets.RawImageWidget import fn
< from .widgets.RawImageWidget import np
< from .widgets.CheckTable import CheckTable
< from .widgets.ColorMapWidget import ColorMapWidget
< from .widgets.SpinBox import SpinBox
< from .widgets.JoystickButton import JoystickButton
< from .widgets.TreeWidget import TreeWidget
< from .widgets.TreeWidget import TreeWidgetItem
< from .widgets.FeedbackButton import FeedbackButton
< from .widgets.TableWidget import TableWidget
< from .widgets.PlotWidget import PlotWidget
< from .widgets.DataTreeWidget import DataTreeWidget
< from .widgets.ComboBox import ComboBox
< from .widgets.ComboBox import QtCore
< from .widgets.ComboBox import QtGui
< from .widgets.ComboBox import SignalProxy
< from .widgets.VerticalLabel import VerticalLabel
< from .widgets.FileDialog import FileDialog
< from .widgets.HistogramLUTWidget import HistogramLUTWidget
< from .widgets.LayoutWidget import LayoutWidget
< from .widgets.GraphicsView import GraphicsView
< from .widgets.PathButton import PathButton
< from .widgets.MultiPlotWidget import MultiPlotWidget
< from .widgets.GraphicsLayoutWidget import GraphicsLayoutWidget
< from .widgets.DataFilterWidget import DataFilterWidget
< from .widgets.ScatterPlotWidget import ScatterPlotWidget
< from .widgets.GradientWidget import GradientWidget
<
---
> importAll('graphicsItems', globals(), locals())
> importAll('widgets', globals(), locals(), excludes=['MatplotlibWidget', 'RemoteGraphicsView'])