Changeset 4372

Timestamp:

Mar 18, 2020 5:25:22 PM (4 years ago)

Author:

toby

Message:

streamline Post access to web pages; try http before https

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• SUBGROUPS.py (modified) (4 diffs)
• kSUBGROUPSMAG.py (modified) (4 diffs)

trunk/GSASIIIO.py

@@ -2227 +2227 @@
     return Layer
 
+def postURL(URL,postdict):
+    '''Posts a set of values as from a web form. If access fails to an http 
+    site the access is retried with https
+    :param str URL: the URL to post; typically something 
+       like 'http://www.../dir/page?'
+    :param dict postdict: contains keywords and values, such
+       as {'centrosymmetry': '0', 'crystalsystem': '0', ...}
+    :returns: a string with the response from the web server or None
+       if access fails.
+    '''
+    try:
+        import requests # delay this until now, since rarely needed
+    except:
+        # this import seems to fail with the Anaconda pythonw on
+        # macs; it should not!
+        print('Warning: failed to import requests. Python config error')
+        return None
+        
+    repeat = True
+    while repeat:
+        r = None
+        repeat = False
+        try:
+            r = requests.get(URL,params=postdict)
+            if r.status_code == 200:
+                print('request OK')
+                page = r.text
+                return page # success
+            else:
+                print('request to {} failed. Reason={}'.format(URL,r.reason))
+        except Exception as msg:     #ConnectionError?
+            print('connection error - not on internet?')
+            if GSASIIpath.GetConfigValue('debug'): print(msg)
+        finally:
+            if r: r.close()
+        if URL.startswith('http:'):
+            repeat = True
+            URL = URL.replace('http:','https:')
+    else:
+        return None
+
 if __name__ == '__main__':
     import GSASIIdataGUI

trunk/SUBGROUPS.py

@@ -16 +16 @@
 ########### SVN repository information ###################
 from __future__ import division, print_function
-import requests
 import numpy as np
 import numpy.linalg as nl
 import GSASIIspc as G2spc
+import GSASIIIO as G2IO
 import GSASIIpath
 GSASIIpath.SetBinaryPath()
-submagSite = 'https://www.cryst.ehu.es/cgi-bin/cryst/programs/subgrmag1_general_GSAS.pl?'
+submagSite = 'http://www.cryst.ehu.es/cgi-bin/cryst/programs/subgrmag1_general_GSAS.pl?'
 
 def GetNonStdSubgroups(SGData, kvec,star=False,landau=False,maximal=False):
@@ -83 +83 @@
         for i,k in zip(('x','y','z'),kvec[3*j-3:3*j]):
             postdict['knm%d%s'%(j,i)] = k
-    try:
-        r = requests.get(submagSite,params=postdict)
-    except:     #ConnectionError?
-        page = ''
-        print('connection error - not on internet')
+    page = G2IO.postURL(submagSite,postdict)
+    if not page:
+        print('connection error - not on internet?')
         return None,None
-    if r.status_code == 200:
-        print('request OK')
-        page = r.text
-        page = page.replace('<font style= "text-decoration: overline;">','<font>-')
-    else:
-        page = ''
-        print('request failed. Reason=',r.reason)
-        return None,None
-    r.close()
-    
+    page = page.replace('<font style= "text-decoration: overline;">','<font>-')
     result = page.replace('&','\n')
     result = result.split('\n')
@@ -211 +200 @@
         for i,k in zip(('x','y','z'),kvec[3*j-3:3*j]):
             postdict['km%d%s'%(j,i)] = k
-    try:
-        r = requests.get(submagSite,params=postdict)
-    except:     #ConnectionError?
-        page = ''
-        print('connection error - not on internet')
+    page = G2IO.postURL(submagSite,postdict)
+    if not page:
+        print('connection error - not on internet?')
         return None,None
-    if r.status_code == 200:
-        print('request OK')
-        page = r.text
-        page = page.replace('<font style= "text-decoration: overline;">','<font>-')
-    else:
-        page = ''
-        print('request failed. Reason=',r.reason)
-        return None,None
-    r.close()
-
+    page = page.replace('<font style= "text-decoration: overline;">','<font>-')
     result = page.replace('&','\n')
     result = result.split('\n')
@@ -283 +261 @@
     datastr = "sgr={:}&cell={:}&tol={:}&submit=Show".format(
         str(int(spgNum)),cellstr,str(int(tol)))
-    try:
-        r = requests.get(psSite,params=datastr)
-    except:     #ConnectionError?
-        page = ''
-        print('connection error - not on internet')
+    page = G2IO.postURL(psSite,datastr)
+    if not page:
+        print('connection error - not on internet?')
         return None
-    if r.status_code == 200:
-        print('request OK')
-        page = r.text
-        page = page.replace('<font style= "text-decoration: overline;">','<font>-')
-    else:
-        page = ''
-        print('request failed. Reason=',r.reason)
-        return None
-    r.close()
+    page = page.replace('<font style= "text-decoration: overline;">','<font>-')
     return page
 

trunk/kSUBGROUPSMAG.py

@@ -16 +16 @@
 ########### SVN repository information ###################
 from __future__ import division, print_function
-import requests
 try:
     import HTMLParser as HTML
@@ -22 +21 @@
     import html.parser as HTML # Python 3
 import GSASIIspc as G2spc
+import GSASIIIO as G2IO
 import GSASIIpath
 GSASIIpath.SetBinaryPath()
@@ -140 +140 @@
         for i,k in zip(('x','y','z'),kvec[3*j-3:3*j]):
             postdict['km%d%s'%(j,i)] = k
-    try:
-        r = requests.get(submagSite,params=postdict)
-    except:     #ConnectionError?
-        page = ''
-        print('connection error - not on internet')
+    page = G2IO.postURL(submagSite,postdict)
+    if not page:
+        print('connection error - not on internet?')
         return None,None
-    if r.status_code == 200:
-        print('request OK')
-        page = r.text
-        page = page.replace('<font style= "text-decoration: overline;">','<font>-')
-    else:
-        page = ''
-        print('request failed. Reason=',r.reason)
-        return None,None
-    r.close()
-
+    page = page.replace('<font style= "text-decoration: overline;">','<font>-')
     p = TableParser()
     p.feed(page)
@@ -213 +202 @@
         for i,k in zip(('x','y','z'),kvec[3*j-3:3*j]):
             postdict['knm%d%s'%(j,i)] = k
-    try:
-        r = requests.get(submagSite,params=postdict)
-    except:     #ConnectionError?
-        page = ''
-        print('connection error - not on internet')
-        return None
-    if r.status_code == 200:
-        print('request OK')
-        page = r.text
-        page = page.replace('<font style= "text-decoration: overline;">','<font>-')
-    else:
-        page = ''
-        print('request failed. Reason=',r.reason)
-        return None
-    r.close()
-
+    if not page:
+        print('connection error - not on internet?')
+        return None,None
+    page = page.replace('<font style= "text-decoration: overline;">','<font>-')
     p = TableParser()
     p.feed(page)