Changeset 4372 for trunk/kSUBGROUPSMAG.py

Timestamp:

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

Author:

toby

Message:

streamline Post access to web pages; try http before https

File:

• trunk/kSUBGROUPSMAG.py (modified) (4 diffs)

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)