Changeset 4346 for trunk/GSASIIdataGUI.py

Timestamp:

Mar 6, 2020 5:17:15 PM (3 years ago)

Author:

toby

Message:

implement additional proxy access (documented in ​https://subversion.xray.aps.anl.gov/trac/pyGSAS/wiki/ProxyInfo)

File:

• trunk/GSASIIdataGUI.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -2123 +2123 @@
         '''Edit the proxy information used by subversion
         '''
-        h,p = host,port = GSASIIpath.getsvnProxy()
+        h,p,e = host,port,etc = GSASIIpath.getsvnProxy()
+        if e:
+            proxyinfo = os.path.join(GSASIIpath.path2GSAS2,"proxyinfo.txt")
+            G2G.G2MessageBox(self,'File {} has manually-'.format(proxyinfo)+
+                'entered information. Please edit this by hand',
+                                 'Unable to edit')
+            return
         dlg = G2G.MultiStringDialog(self,'Enter proxy values',
                                         ['Proxy address','proxy port'],
                                         [host,port],size=300)
-        #dlg.SetSize((300,-1))
         if dlg.Show():
             h,p = dlg.GetValues()