Merge branch 'patches-from-python3'

pavoljuhas · pavoljuhas · commit 364265f76e60 · 2018-12-11T19:40:00.000-05:00
Sync with 'python3' at 7761373.
diff --git a/doc/examples/coreshellnp.py b/doc/examples/coreshellnp.py
@@ -142,8 +142,8 @@ def plotResults(recipe):
     pylab.plot(r, gcalc,'r-',label="G(r) Fit")
     pylab.plot(r,diff,'g-',label="G(r) diff")
     pylab.plot(r,diffzero,'k-')
-    pylab.xlabel("$r (\AA)$")
-    pylab.ylabel("$G (\AA^{-2})$")
+    pylab.xlabel(r"$r (\AA)$")
+    pylab.ylabel(r"$G (\AA^{-2})$")
     pylab.legend(loc=1)
 
     pylab.show()
diff --git a/doc/examples/crystalpdf.py b/doc/examples/crystalpdf.py
@@ -138,8 +138,8 @@ def plotResults(recipe):
     pylab.plot(r, gcalc,'r-',label="G(r) Fit")
     pylab.plot(r,diff,'g-',label="G(r) diff")
     pylab.plot(r,diffzero,'k-')
-    pylab.xlabel("$r (\AA)$")
-    pylab.ylabel("$G (\AA^{-2})$")
+    pylab.xlabel(r"$r (\AA)$")
+    pylab.ylabel(r"$G (\AA^{-2})$")
     pylab.legend(loc=1)
 
     pylab.show()
diff --git a/doc/examples/crystalpdfall.py b/doc/examples/crystalpdfall.py
@@ -176,8 +176,8 @@ def plotResults(recipe):
     pylab.plot(xr_ni,xgcalc_ni,'r-',label="G(r) x-ray nickel Fit")
     pylab.plot(xr_ni,xdiff_ni,'g-',label="G(r) x-ray nickel diff")
     pylab.plot(xr_ni,xdiffzero_ni,'k-')
-    pylab.xlabel("$r (\AA)$")
-    pylab.ylabel("$G (\AA^{-2})$")
+    pylab.xlabel(r"$r (\AA)$")
+    pylab.ylabel(r"$G (\AA^{-2})$")
     pylab.legend(loc=1)
 
     pylab.subplot(2, 2, 2)
diff --git a/doc/examples/crystalpdftwodata.py b/doc/examples/crystalpdftwodata.py
@@ -161,8 +161,8 @@ def plotResults(recipe):
     pylab.plot(nr,ngcalc,'r-',label="G(r) neutron Fit")
     pylab.plot(nr,ndiff,'g-',label="G(r) neutron diff")
     pylab.plot(nr,ndiffzero,'k-')
-    pylab.xlabel("$r (\AA)$")
-    pylab.ylabel("$G (\AA^{-2})$")
+    pylab.xlabel(r"$r (\AA)$")
+    pylab.ylabel(r"$G (\AA^{-2})$")
     pylab.legend(loc=1)
 
     pylab.show()
diff --git a/doc/examples/crystalpdftwophase.py b/doc/examples/crystalpdftwophase.py
@@ -152,8 +152,8 @@ def plotResults(recipe):
     pylab.plot(r, gcalc,'r-',label="G(r) Fit")
     pylab.plot(r,diff,'g-',label="G(r) diff")
     pylab.plot(r,diffzero,'k-')
-    pylab.xlabel("$r (\AA)$")
-    pylab.ylabel("$G (\AA^{-2})$")
+    pylab.xlabel(r"$r (\AA)$")
+    pylab.ylabel(r"$G (\AA^{-2})$")
     pylab.legend(loc=1)
 
     pylab.show()
diff --git a/doc/examples/debyemodel.py b/doc/examples/debyemodel.py
@@ -166,7 +166,7 @@ def plotResults(recipe):
     pylab.plot(T,U,'o',label="Pb $U_{iso}$ Data")
     pylab.plot(T,Ucalc)
     pylab.xlabel("T (K)")
-    pylab.ylabel("$U_{iso} (\AA^2)$")
+    pylab.ylabel(r"$U_{iso} (\AA^2)$")
     pylab.legend(loc = (0.0,0.8))
 
     pylab.show()
diff --git a/doc/examples/debyemodelII.py b/doc/examples/debyemodelII.py
@@ -115,12 +115,12 @@ def plotResults(recipe):
     # Now we can plot this.
     import pylab
     pylab.plot(T,U,'o',label="Pb $U_{iso}$ Data")
-    lbl1 = "$T_d$=%3.1f K, lowToff=%1.5f $\AA^2$"% (abs(thetaD),lowToffset)
-    lbl2 = "$T_d$=%3.1f K, highToff=%1.5f $\AA^2$"% (abs(thetaD),highToffset)
+    lbl1 = r"$T_d$=%3.1f K, lowToff=%1.5f $\AA^2$"% (abs(thetaD),lowToffset)
+    lbl2 = r"$T_d$=%3.1f K, highToff=%1.5f $\AA^2$"% (abs(thetaD),highToffset)
     pylab.plot(T,lowU,label=lbl1)
     pylab.plot(T,highU,label=lbl2)
     pylab.xlabel("T (K)")
-    pylab.ylabel("$U_{iso} (\AA^2)$")
+    pylab.ylabel(r"$U_{iso} (\AA^2)$")
     pylab.legend(loc = (0.0,0.8))
 
     pylab.show()
diff --git a/doc/examples/ellipsoidsas.py b/doc/examples/ellipsoidsas.py
@@ -94,7 +94,7 @@ def plotResults(recipe):
     pylab.loglog(r,y,'bo',label="I(Q) Data")
     pylab.loglog(r, ycalc,'r-',label="I(Q) Fit")
     pylab.loglog(r,diff,'g-',label="I(Q) diff")
-    pylab.xlabel("$Q (\AA^{-1})$")
+    pylab.xlabel(r"$Q (\AA^{-1})$")
     pylab.ylabel("$I (arb. units)$")
     pylab.legend(loc=1)
 
diff --git a/doc/examples/npintensity.py b/doc/examples/npintensity.py
@@ -339,7 +339,7 @@ def plotResults(recipe):
     pylab.plot(q,Icalc,'r-',label="I(Q) Fit")
     pylab.plot(q,diff,'g-',label="I(Q) diff")
     pylab.plot(q,bkgd,'c-',label="Bkgd. Fit")
-    pylab.xlabel("$Q (\AA^{-1})$")
+    pylab.xlabel(r"$Q (\AA^{-1})$")
     pylab.ylabel("Intensity (arb. units)")
     pylab.legend(loc=1)
 
diff --git a/doc/examples/npintensityII.py b/doc/examples/npintensityII.py
@@ -209,7 +209,7 @@ def plotResults(recipe):
     pylab.plot(q,Icalc2,'r-',label="I2(Q) Fit")
     pylab.plot(q,diff2,'g-',label="I2(Q) diff")
     pylab.plot(q,bkgd2,'c-',label="Bkgd2 Fit")
-    pylab.xlabel("$Q (\AA^{-1})$")
+    pylab.xlabel(r"$Q (\AA^{-1})$")
     pylab.ylabel("Intensity (arb. units)")
     pylab.legend(loc=1)
 
diff --git a/doc/examples/nppdfcrystal.py b/doc/examples/nppdfcrystal.py
@@ -102,8 +102,8 @@ def plotResults(recipe):
     pylab.plot(r, gcalc,'r-',label="G(r) Fit")
     pylab.plot(r,diff,'g-',label="G(r) diff")
     pylab.plot(r, diffzero,'k-')
-    pylab.xlabel("$r (\AA)$")
-    pylab.ylabel("$G (\AA^{-2})$")
+    pylab.xlabel(r"$r (\AA)$")
+    pylab.ylabel(r"$G (\AA^{-2})$")
     pylab.legend(loc=1)
 
     pylab.show()
diff --git a/doc/examples/nppdfobjcryst.py b/doc/examples/nppdfobjcryst.py
@@ -118,8 +118,8 @@ def plotResults(recipe):
     pylab.plot(r,gcalc,'-r',label="G(r) Fit")
     pylab.plot(r,diff,'-g',label="G(r) diff")
     pylab.plot(r,diffzero,'-k')
-    pylab.xlabel("$r (\AA)$")
-    pylab.ylabel("$G (\AA^{-2})$")
+    pylab.xlabel(r"$r (\AA)$")
+    pylab.ylabel(r"$G (\AA^{-2})$")
     pylab.legend(loc=1)
 
     pylab.show()
diff --git a/doc/examples/nppdfsas.py b/doc/examples/nppdfsas.py
@@ -166,8 +166,8 @@ def plotResults(recipe):
     pylab.plot(r, gcalc,'r-',label="G(r) Fit")
     pylab.plot(r, diff,'g-',label="G(r) diff")
     pylab.plot(r, diffzero,'k-')
-    pylab.xlabel("$r (\AA)$")
-    pylab.ylabel("$G (\AA^{-2})$")
+    pylab.xlabel(r"$r (\AA)$")
+    pylab.ylabel(r"$G (\AA^{-2})$")
     pylab.legend(loc=1)
 
     pylab.show()
diff --git a/src/diffpy/srfit/structure/sgconstraints.py b/src/diffpy/srfit/structure/sgconstraints.py
@@ -661,7 +661,7 @@ def _makeconstraint(parname, formula, scatterer, idx, ns = {}):
     compname = "%s_%i"%(parname, idx)
 
     # Check to see if this parameter is free
-    pat = '%s *((\+|-) *\d+)?$'%compname
+    pat = r'%s *([+-] *\d+)?$' % compname
     if re.match(pat, formula):
         return par
 
diff --git a/src/diffpy/srfit/tests/run.py b/src/diffpy/srfit/tests/run.py
@@ -20,6 +20,12 @@
 
 if __name__ == '__main__':
     import sys
+    # show warnings by default
+    if not sys.warnoptions:
+        import os, warnings
+        warnings.simplefilter("default")
+        # also affect subprocesses
+        os.environ["PYTHONWARNINGS"] = "default"
     from diffpy.srfit.tests import test
     # produce zero exit code for a successful test
     sys.exit(not test().wasSuccessful())
