Skip to content

Commit 113133c

Browse files
committed
Fix starred imports from controlerrors.
Use explicit imports instead. This allows pyflakes check for undefined or unused names.
1 parent 6ea044a commit 113133c

11 files changed

+16
-11
lines changed

diffpy/pdfgui/control/calculation.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
import math
2121
import types
2222

23-
from diffpy.pdfgui.control.controlerrors import *
23+
from diffpy.pdfgui.control.controlerrors import ControlConfigError
24+
from diffpy.pdfgui.control.controlerrors import ControlKeyError
25+
from diffpy.pdfgui.control.controlerrors import ControlValueError
2426
from diffpy.pdfgui.control.pdfcomponent import PDFComponent
2527

2628
class Calculation(PDFComponent):

diffpy/pdfgui/control/fitting.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
import time
1818

1919
from diffpy.pdfgui.control.organizer import Organizer
20-
from diffpy.pdfgui.control.controlerrors import *
20+
from diffpy.pdfgui.control.controlerrors import ControlError
21+
from diffpy.pdfgui.control.controlerrors import ControlStatusError
22+
from diffpy.pdfgui.control.controlerrors import ControlValueError
2123

2224
# helper routines to deal with PDFfit2 exceptions
2325

diffpy/pdfgui/control/pdfguicontrol.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
from diffpy.pdfgui.control.fitdataset import FitDataSet
2626
from diffpy.pdfgui.control.organizer import Organizer
2727
from diffpy.pdfgui.control.fitstructure import FitStructure
28-
from diffpy.pdfgui.control.controlerrors import *
28+
from diffpy.pdfgui.control.controlerrors import ControlError
29+
from diffpy.pdfgui.control.controlerrors import ControlFileError
30+
from diffpy.pdfgui.control.controlerrors import ControlRuntimeError
31+
from diffpy.pdfgui.control.controlerrors import ControlTypeError
2932

3033

3134
class PDFGuiControl:

diffpy/pdfgui/control/plotter.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
##############################################################################
1515

1616
from diffpy.pdfgui.control.pdfcomponent import PDFComponent
17-
from diffpy.pdfgui.control.controlerrors import *
17+
from diffpy.pdfgui.control.controlerrors import ControlConfigError
18+
from diffpy.pdfgui.control.controlerrors import ControlStatusError
1819
from diffpy.pdfgui.gui.extendedplotframe import ExtendedPlotFrame
1920

2021
# Preset plotting style

diffpy/pdfgui/gui/bondangledialog.py

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717

1818
import wx
19-
from diffpy.pdfgui.control.controlerrors import *
2019
from diffpy.pdfgui.gui.pdfpanel import PDFPanel
2120

2221
class BondAngleDialog(wx.Dialog, PDFPanel):

diffpy/pdfgui/gui/bondlengthdialog.py

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# generated by wxGlade 0.6 on Mon Oct 15 14:14:18 2007
1818

1919
import wx
20-
from diffpy.pdfgui.control.controlerrors import *
2120
from diffpy.pdfgui.gui.wxExtensions.validators import TextValidator, FLOAT_ONLY
2221

2322
# begin wxGlade: extracode

diffpy/pdfgui/gui/phaseconfigurepanel.py

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import wx.grid
2121
from diffpy.Structure import Atom
2222
from diffpy.pdffit2 import is_element
23-
from diffpy.pdfgui.control.controlerrors import *
2423
from diffpy.pdfgui.gui.insertrowsdialog import InsertRowsDialog
2524
from diffpy.pdfgui.gui.pdfpanel import PDFPanel
2625
from diffpy.pdfgui.gui.tooltips import phasepanel as toolTips

diffpy/pdfgui/gui/phaseconstraintspanel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import wx
2121
import wx.grid
2222
from diffpy.pdfgui.control.constraint import Constraint
23-
from diffpy.pdfgui.control.controlerrors import *
23+
from diffpy.pdfgui.control.controlerrors import ControlValueError
2424
from diffpy.pdfgui.gui.pdfpanel import PDFPanel
2525
from diffpy.pdfgui.gui.tooltips import phasepanel as toolTips
2626
from diffpy.pdfgui.gui.wxExtensions.autowidthlabelsgrid import \

diffpy/pdfgui/gui/plotpanel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from diffpy.pdfgui.gui.wxExtensions.listctrls import KeyEventsListCtrl
2424
from diffpy.pdfgui.gui.wxExtensions.validators import TextValidator, FLOAT_ONLY
2525
from diffpy.pdfgui.gui.pdfpanel import PDFPanel
26-
from diffpy.pdfgui.control.controlerrors import *
26+
from diffpy.pdfgui.control.controlerrors import ControlConfigError
2727

2828
class PlotPanel(wx.Panel, PDFPanel):
2929
def __init__(self, *args, **kwds):

diffpy/pdfgui/gui/sgconstraindialog.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import math
2020
import wx
21-
from diffpy.pdfgui.control.controlerrors import *
21+
from diffpy.pdfgui.control.controlerrors import ControlValueError
2222
from diffpy.pdfgui.gui.pdfpanel import PDFPanel
2323

2424
class SGConstrainDialog(wx.Dialog, PDFPanel):

diffpy/pdfgui/gui/sgstructuredialog.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import math
2020
import wx
21-
from diffpy.pdfgui.control.controlerrors import *
21+
from diffpy.pdfgui.control.controlerrors import ControlValueError
2222
from diffpy.pdfgui.gui.pdfpanel import PDFPanel
2323

2424
class SGStructureDialog(wx.Dialog, PDFPanel):

0 commit comments

Comments
 (0)