Fix unused variables reported by pyflakes.

Delete or comment-out unused variables.
If plausibly useful, add dummy assertions to silence pyflakes.

Author: pavoljuhas

diffpy/pdfgui/__init__.py

@@ -20,4 +20,7 @@
 
 from diffpy.pdfgui.version import __version__
 
+# silence the pyflakes syntax checker
+assert __version__
+
 # End of file

diffpy/pdfgui/bugreport.py

@@ -96,6 +96,8 @@ def submitBugReport(formfields):
     post_request = urllib2.Request(post_url, post_content, post_headers)
     post_handle = opener.open(post_request)
     # result can be obtained by post_handle.read(), but it is not needed
+    # silence the pyflakes syntax checker
+    assert post_handle or True
     return
 
 

diffpy/pdfgui/control/constraint.py

@@ -130,7 +130,7 @@ def __setattr__(self, name, value):
             fncx = eval('lambda x:' +
                         re.sub('@\d+', 'x', newformula), vars(math))
             # check if fncx(0.25) is float
-            y = fncx(0.25) + 0.0
+            fncx(0.25) + 0.0
         except (ValueError, SyntaxError, TypeError, NameError):
             message = "invalid constraint formula '%s'" % newformula
             raise ControlSyntaxError, message

diffpy/pdfgui/control/pdffitsandbox.py

@@ -639,7 +639,7 @@ def setphase(self, ip):
             IndexError if phase ip does not exist
         """
         # check if we have valid index
-        curphase = self._fits[-1].strucs[ip - 1]
+        self._fits[-1].strucs[ip - 1]
         # if we get here, it is OK
         self._curphase = ip - 1
         return
@@ -653,7 +653,7 @@ def setdata(self, iset):
             IndexError if dataset iset does not exist
         """
         # check if we have valid index
-        curdataset = self._fits[-1].datasets[iset - 1]
+        self._fits[-1].datasets[iset - 1]
         # if we get here, it is OK
         self._curdataset = iset - 1
         return

diffpy/pdfgui/gui/aboutdialog.py

@@ -133,14 +133,8 @@ def __init__(self, *args, **kwds):
         self.bitmap_button_columbia.SetBitmapLabel(logo)
 
         # resize dialog window to fit version number nicely
-        if wx.VERSION >= (2,7,2,0):
-            size = [self.GetEffectiveMinSize()[0], self.GetSize()[1]]
-        else:
-            size = [self.GetBestFittingSize()[0], self.GetSize()[1]]
-
         self.Fit()
-#        self.SetSize(size)
-#       self.FitInside()
+        return
 
 
     def __set_properties(self):

diffpy/pdfgui/gui/mainframe.py

@@ -1168,6 +1168,8 @@ def onBeginLabelEdit(self, event): # wxGlade: MainPanel.<event_handler>
         * Editing any item in "addingdata", "addingphase", or "config" mode.
         """
         nodetype = self.treeCtrlMain.GetNodeType(event.GetItem())
+        # silence the pyflakes syntax checker
+        assert nodetype or True
         if self.mode != "fitting":
             event.Veto()
         return
@@ -1233,6 +1235,8 @@ def onRightClick(self, event): # wxGlade: MainPanel.<event_handler>
         if selections:
             node = self.treeCtrlMain.GetFitRoot(selections[0])
             nodetype = self.treeCtrlMain.GetNodeType(node)
+            # silence the pyflakes syntax checker
+            assert nodetype or True
             if node in self.runningDict.values():
                 return
 
@@ -1271,6 +1275,8 @@ def onRightClick(self, event): # wxGlade: MainPanel.<event_handler>
                 self.treeCtrlMain.SelectItem(node)
                 selections = [node]
             itemtype = self.treeCtrlMain.GetNodeType(node)
+            # silence the pyflakes syntax checker
+            assert itemtype or True
             # Enable/Disable certain entries based upon where we clicked.
             self.disableSharedMenuItems(menu)
 
@@ -1967,7 +1973,7 @@ def _plotStruct(self, stype):
             node = selections[0]
             itemtype = self.treeCtrlMain.GetNodeType(node)
             if itemtype == "phase":
-                panel = self.dynamicPanels['phase']
+                # panel = self.dynamicPanels['phase']
                 cdata = self.treeCtrlMain.GetControlData(node)
                 stru = getattr(cdata, stype)
                 viewer = structureviewer.getStructureViewer()
@@ -1983,7 +1989,7 @@ def onPrintBL(self, event):
             node = selections[0]
             itemtype = self.treeCtrlMain.GetNodeType(node)
             if itemtype == "phase":
-                panel = self.dynamicPanels['phase']
+                # panel = self.dynamicPanels['phase']
                 cdata = self.treeCtrlMain.GetControlData(node)
                 S = cdata.refined
                 if not S: S = cdata.initial
@@ -2026,7 +2032,7 @@ def onPrintBA(self, event):
             node = selections[0]
             itemtype = self.treeCtrlMain.GetNodeType(node)
             if itemtype == "phase":
-                panel = self.dynamicPanels['phase']
+                # panel = self.dynamicPanels['phase']
                 cdata = self.treeCtrlMain.GetControlData(node)
                 S = cdata.refined
                 if not S: S = cdata.initial
@@ -2296,7 +2302,7 @@ def onExportNewStruct(self, event):
         nodetype = self.treeCtrlMain.GetNodeType(node)
         if nodetype != 'phase': return
         cdata = self.treeCtrlMain.GetControlData(node)
-        branchname = self.treeCtrlMain.GetBranchName(node)
+        # branchname = self.treeCtrlMain.GetBranchName(node)
         name = self.treeCtrlMain.GetItemText(node)
         basename = '.'.join(name.split('.')[:-1]) or name
         matchstring = "PDFfit structure file (*.stru)|*.stru|Crystallographic Information File (*.cif)|*.cif|Protein Data Bank file (*.pdb)|*.pdb|Labeled coordinate file (*.xyz)|*.xyz|Raw corrdinate file (*.xyz)|*.xyz|AtomEye configuration file|*"
@@ -2328,7 +2334,7 @@ def onExportStruct(self, event):
         nodetype = self.treeCtrlMain.GetNodeType(node)
         if nodetype != 'phase': return
         cdata = self.treeCtrlMain.GetControlData(node)
-        branchname = self.treeCtrlMain.GetBranchName(node)
+        # branchname = self.treeCtrlMain.GetBranchName(node)
         name = self.treeCtrlMain.GetItemText(node)
         basename = '.'.join(name.split('.')[:-1]) or name
         matchstring = "PDFfit structure file (*.stru)|*.stru|Crystallographic Information File (*.cif)|*.cif|Protein Data Bank file (*.pdb)|*.pdb|Labeled coordinate file (*.xyz)|*.xyz|Raw corrdinate file (*.xyz)|*.xyz|AtomEye configuration file|*"
@@ -2358,7 +2364,7 @@ def onExportPDF(self, event):
         nodetype = self.treeCtrlMain.GetNodeType(node)
         if nodetype != 'dataset': return
         cdata = self.treeCtrlMain.GetControlData(node)
-        branchname = self.treeCtrlMain.GetBranchName(node)
+        # branchname = self.treeCtrlMain.GetBranchName(node)
         name = self.treeCtrlMain.GetItemText(node)
         basename = '.'.join(name.split('.')[:-1]) or name
         matchstring = "PDF fit data file (*.fgr)|*.fgr|All Files|*"

diffpy/pdfgui/gui/phasenotebookpanel.py

@@ -89,7 +89,7 @@ def refresh(self):
 
     def onNotebookPageChanging(self, event):
         """Called during the page selection change."""
-        focusedId = event.GetOldSelection()
+        # focusedId = event.GetOldSelection()
         panel = self.notebook_phase.GetPage(self.focusedId)
         panel._cache()
         return