remove six usage (#187)

Author: Tieqiong

Diff for: src/diffpy/pdfgui/control/calculation.py

@@ -18,10 +18,11 @@
 
 import copy
 import math
+import pickle
 
 from diffpy.pdfgui.control.controlerrors import ControlConfigError, ControlKeyError, ControlValueError
 from diffpy.pdfgui.control.pdfcomponent import PDFComponent
-from diffpy.pdfgui.utils import pickle_loads, safeCPickleDumps
+from diffpy.pdfgui.utils import safeCPickleDumps
 
 
 class Calculation(PDFComponent):
@@ -253,7 +254,7 @@ def load(self, z, subpath):
 
         returns a tree of internal hierachy
         """
-        config = pickle_loads(z.read(subpath + "config"))
+        config = pickle.loads(z.read(subpath + "config"), encoding="latin1")
         self.rmin = config["rmin"]
         self.rstep = config["rstep"]
         self.rmax = config["rmax"]

Diff for: src/diffpy/pdfgui/control/fitdataset.py

@@ -461,7 +461,9 @@ def load(self, z, subpath):
         z       -- zipped project file
         subpath -- path to its own storage within project file
         """
-        from diffpy.pdfgui.utils import asunicode, pickle_loads
+        import pickle
+
+        from diffpy.pdfgui.utils import asunicode
 
         self.clear()
         subs = subpath.split("/")
@@ -471,7 +473,7 @@ def load(self, z, subpath):
         self.readObsStr(obsdata)
 
         # data from calculation
-        content = pickle_loads(z.read(subpath + "calc"))
+        content = pickle.loads(z.read(subpath + "calc"), encoding="latin1")
         for item in FitDataSet.persistentItems:
             # skip items which are not in the project file
             if item not in content:

Diff for: src/diffpy/pdfgui/control/fitting.py

@@ -15,12 +15,13 @@
 
 from __future__ import print_function
 
+import pickle
 import threading
 import time
 
 from diffpy.pdfgui.control.controlerrors import ControlError, ControlStatusError, ControlValueError
 from diffpy.pdfgui.control.organizer import Organizer
-from diffpy.pdfgui.utils import pickle_loads, safeCPickleDumps
+from diffpy.pdfgui.utils import safeCPickleDumps
 
 # helper routines to deal with PDFfit2 exceptions
 
@@ -210,9 +211,11 @@ def load(self, z, subpath):
 
             self.parameters = CtrlUnpickler.loads(z.read(subpath + "parameters"))
         if "steps" in rootDict:
-            self.itemIndex, self.dataNameDict, self.snapshots = pickle_loads(z.read(subpath + "steps"))
+            self.itemIndex, self.dataNameDict, self.snapshots = pickle.loads(
+                z.read(subpath + "steps"), encoding="latin1"
+            )
         if "result" in rootDict:
-            self.rw, self.res = pickle_loads(z.read(subpath + "result"))
+            self.rw, self.res = pickle.loads(z.read(subpath + "result"), encoding="latin1")
 
         return Organizer.load(self, z, subpath)
 

Diff for: src/diffpy/pdfgui/control/organizer.py

@@ -160,25 +160,25 @@ def load(self, z, subpath):
         returns a tree of internal hierachy
         """
         # subpath = projName/myName/
-        from diffpy.pdfgui.utils import unquote_plain
+        from urllib.parse import unquote_plus
 
         subs = subpath.split("/")
         rootDict = z.fileTree[subs[0]][subs[1]]
         if "structure" in rootDict:
             for strucName in rootDict["structure"].keys():
-                struc = FitStructure(unquote_plain(strucName))
+                struc = FitStructure(unquote_plus(strucName))
                 struc.load(z, subpath + "structure/" + strucName + "/")
                 self.add(struc)
 
         if "dataset" in rootDict:
             for datasetName in rootDict["dataset"].keys():
-                dataset = FitDataSet(unquote_plain(datasetName))
+                dataset = FitDataSet(unquote_plus(datasetName))
                 dataset.load(z, subpath + "dataset/" + datasetName + "/")
                 self.add(dataset)
 
         if "calculation" in rootDict:
             for calcName in rootDict["calculation"].keys():
-                calc = Calculation(unquote_plain(calcName))
+                calc = Calculation(unquote_plus(calcName))
                 calc.load(z, subpath + "calculation/" + calcName + "/")
                 self.add(calc)
 
@@ -193,14 +193,14 @@ def save(self, z, subpath):
         subpath -- path to its own storage within project file
         """
         # strucs and datasets
-        from diffpy.pdfgui.utils import quote_plain
+        from urllib.parse import quote_plus
 
         for struc in self.strucs:
-            struc.save(z, subpath + "structure/" + quote_plain(struc.name) + "/")
+            struc.save(z, subpath + "structure/" + quote_plus(struc.name) + "/")
         for dataset in self.datasets:
-            dataset.save(z, subpath + "dataset/" + quote_plain(dataset.name) + "/")
+            dataset.save(z, subpath + "dataset/" + quote_plus(dataset.name) + "/")
         for calc in self.calcs:
-            calc.save(z, subpath + "calculation/" + quote_plain(calc.name) + "/")
+            calc.save(z, subpath + "calculation/" + quote_plus(calc.name) + "/")
         return
 
     def copy(self, other=None):

Diff for: src/diffpy/pdfgui/control/parameter.py

@@ -17,8 +17,6 @@
 To be stored in Fitting.parameters { idx : parameter } dictionary
 """
 
-import six
-
 from diffpy.pdfgui.control.controlerrors import (
     ControlError,
     ControlKeyError,
@@ -79,7 +77,7 @@ def setInitial(self, initial):
         if isinstance(initial, Fitting):
             self.__initial = "=" + initial.name
             self.__fitrepr = repr(initial)
-        elif isinstance(initial, six.string_types) and initial[:1] == "=":
+        elif isinstance(initial, str) and initial[:1] == "=":
             self.__initial = initial
             self.__findLinkedFitting()
         else:

Diff for: src/diffpy/pdfgui/control/pdfguicontrol.py

@@ -15,13 +15,13 @@
 
 from __future__ import print_function
 
+import io
 import os
+import pickle
 import sys
 import threading
 import time
-
-import six
-import six.moves.cPickle as pickle
+from urllib.parse import quote_plus
 
 from diffpy.pdfgui.control.calculation import Calculation
 from diffpy.pdfgui.control.controlerrors import ControlError, ControlFileError, ControlTypeError
@@ -30,7 +30,7 @@
 from diffpy.pdfgui.control.fitting import Fitting
 from diffpy.pdfgui.control.organizer import Organizer
 from diffpy.pdfgui.control.pdflist import PDFList
-from diffpy.pdfgui.utils import asunicode, quote_plain
+from diffpy.pdfgui.utils import asunicode
 
 
 class PDFGuiControl:
@@ -395,7 +395,7 @@ def _nameParser(namelist):
                     continue
                 fit = Fitting(name)
                 # fitting name stored in rootDict should be quoted
-                rdname = quote_plain(name)
+                rdname = quote_plus(name)
                 # but let's also handle old project files
                 if rdname not in rootDict:
                     rdname = name
@@ -450,7 +450,7 @@ def save(self, projfile=None):
             # fits also contain calculations
             for fit in self.fits:
                 name = fit.name
-                fit.save(z, projName + "/" + quote_plain(fit.name) + "/")
+                fit.save(z, projName + "/" + quote_plus(fit.name) + "/")
                 fitnames.append(name)
             if self.journal:
                 z.writestr(projName + "/journal", asunicode(self.journal))
@@ -516,7 +516,7 @@ def redirectStdout(self):
         from diffpy.pdffit2 import output, redirect_stdout
 
         if output.stdout is sys.stdout:
-            redirect_stdout(six.StringIO())
+            redirect_stdout(io.StringIO())
         return
 
     def getEngineOutput(self):
@@ -525,7 +525,7 @@ def getEngineOutput(self):
 
         txt = output.stdout.getvalue()
         output.stdout.close()
-        redirect_stdout(six.StringIO())
+        redirect_stdout(io.StringIO())
         return txt
 
 
@@ -571,7 +571,7 @@ def loads(s):
             missedModule = str(err).split(" ")[-1]
             if missedModule.find("pdfgui.control") == -1:
                 raise err
-            f = six.StringIO(s)
+            f = io.StringIO(s)
             unpickler = pickle.Unpickler(f)
             unpickler.find_global = _find_global
             return unpickler.load()

Diff for: src/diffpy/pdfgui/gui/adddatapanel.py

@@ -106,7 +106,7 @@ def readConfiguration(self):
 
         if remember:
             if self.cP.has_option("DATASET", "last"):
-                self.fullpath = self.cP.getquoted("DATASET", "last")
+                self.fullpath = self.cP.get("DATASET", "last")
                 import os.path
 
                 if not os.path.exists(self.fullpath):
@@ -119,7 +119,7 @@ def updateConfiguration(self):
         """Update the configuration for the 'DATASET'."""
         if not self.cP.has_section("DATASET"):
             self.cP.add_section("DATASET")
-        self.cP.setquoted("DATASET", "last", self.fullpath)
+        self.cP.set("DATASET", "last", self.fullpath)
         return
 
     # EVENT CODE ####

Diff for: src/diffpy/pdfgui/gui/addphasepanel.py

@@ -128,7 +128,7 @@ def readConfiguration(self):
 
         if remember:
             if self.cP.has_option("PHASE", "last"):
-                self.fullpath = self.cP.getquoted("PHASE", "last")
+                self.fullpath = self.cP.get("PHASE", "last")
                 import os.path
 
                 if not os.path.exists(self.fullpath):
@@ -141,7 +141,7 @@ def updateConfiguration(self):
         """Update the configuration for the 'DATASET'."""
         if not self.cP.has_section("PHASE"):
             self.cP.add_section("PHASE")
-        self.cP.setquoted("PHASE", "last", self.fullpath)
+        self.cP.set("PHASE", "last", self.fullpath)
         return
 
     # EVENT CODE ####

Diff for: src/diffpy/pdfgui/gui/errorreportdialog.py

@@ -151,7 +151,7 @@ def onGoogle(self, event):  # wxGlade: ErrorReportDialog.<event_handler>
         Search for path-independent module and function names and for
         error message extracted from exception traceback.
         """
-        from six.moves.urllib.parse import quote_plus
+        from urllib.parse import quote_plus
 
         traceback = self.text_ctrl_log.GetValue()
         terms = _extractSearchTerms(traceback)

Diff for: src/diffpy/pdfgui/gui/fittree.py

@@ -23,6 +23,7 @@
 """
 
 import base64
+import pickle
 import re
 
 import wx
@@ -31,7 +32,7 @@
 from diffpy.pdfgui.control.fitting import Fitting
 from diffpy.pdfgui.gui.pdfguiglobals import iconpath
 from diffpy.pdfgui.gui.wxextensions import wx12
-from diffpy.pdfgui.utils import pickle_loads, safeCPickleDumps
+from diffpy.pdfgui.utils import safeCPickleDumps
 
 
 class FitTree(wx12.TreeCtrl):
@@ -610,7 +611,7 @@ def GetClipboard(self):
 
             if cdatabytes[:16] == "pdfgui_cliboard=".encode():
                 cdatabytes = cdatabytes[16:]
-                cdata = pickle_loads(cdatabytes)
+                cdata = pickle.loads(cdatabytes, encoding="latin1")
         except Exception:
             pass
         return cdata

Diff for: src/diffpy/pdfgui/gui/mainframe.py

@@ -18,6 +18,7 @@
 """This module contains the main window of PDFgui."""
 
 import os.path
+from configparser import ConfigParser
 
 import wx
 import wx.aui
@@ -48,7 +49,6 @@
 from diffpy.pdfgui.gui.temperatureseriespanel import TemperatureSeriesPanel
 from diffpy.pdfgui.gui.welcomepanel import WelcomePanel
 from diffpy.pdfgui.gui.wxextensions import wx12
-from diffpy.pdfgui.utils import QuotedConfigParser
 
 (PDFCustomEvent, EVT_PDFCUSTOM) = wx.lib.newevent.NewEvent()
 
@@ -300,9 +300,9 @@ def __customProperties(self):
         self.runningDict = {}
 
         # The configuration parser for getting configuration data.
-        # self.cP = QuotedConfigParser()
+        # self.cP = Configparser()
         # Long try this to avoid DuplicateSectionError and ParsingError
-        self.cP = QuotedConfigParser(strict=False, allow_no_value=True)
+        self.cP = ConfigParser(strict=False, allow_no_value=True, interpolation=None)
 
         # Set the program mode
         self.mode = "fitting"
@@ -984,7 +984,7 @@ def loadConfiguration(self):
             self.cP.read(localpath)
             for i in range(pdfguiglobals.MAXMRU, 0, -1):
                 if self.cP.has_option("MRU", str(i)):
-                    filename = self.cP.getquoted("MRU", str(i))
+                    filename = self.cP.get("MRU", str(i))
                     if filename:
                         self.fileHistory.AddFileToHistory(filename)
 
@@ -1029,7 +1029,7 @@ def updateConfiguration(self):
 
         for i in range(self.fileHistory.GetCount()):
             item = self.fileHistory.GetHistoryFile(i)
-            self.cP.setquoted("MRU", str(i + 1), item)
+            self.cP.set("MRU", str(i + 1), item)
 
         # Window size
         if not self.cP.has_section("SIZE"):
@@ -2522,8 +2522,7 @@ def onSaveCalc(self, event):
     def onDocumentation(self, event):
         """Show information about the documentation."""
         import webbrowser
-
-        from six.moves.urllib.request import pathname2url
+        from urllib.request import pathname2url
 
         url = "file://" + pathname2url(docMainFile)
         webbrowser.open(url)