Changeset 957af0d in sasview

Timestamp:

Jul 24, 2015 2:36:02 PM (9 years ago)

Author:

Ricardo M. Ferraz Leal <ricleal@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

199bb42b

Parents:

069aae2

Message:

Proxy class in debug mode to test

Files:

• sasview/local_config.py (modified) (2 diffs)
• sasview/sasview.py (modified) (1 diff)
• src/sas/guiframe/gui_manager.py (modified) (2 diffs)
• src/sas/guiframe/proxy.py (added)

sasview/local_config.py

@@ -14 +14 @@
 __download_page__ = 'https://github.com/SasView/sasview/releases'
 __update_URL__ = 'http://www.sasview.org/latestversion.json'
-
 
 # Debug message flag
@@ -130 +129 @@
 DEFAULT_PERSPECTIVE = 'None'
 
+# Time out for updating sasview
+UPDATE_TIMEOUT = 2
+
 def printEVT(message):
     if __EVT_DEBUG__:

sasview/sasview.py

@@ -16 +16 @@
 import traceback
 
-logging.basicConfig(level=logging.INFO,
+logging.basicConfig(level=logging.DEBUG,
                     format='%(asctime)s %(levelname)s %(message)s',
                     filename=os.path.join(os.path.expanduser("~"),

src/sas/guiframe/gui_manager.py

@@ -46 +46 @@
 from sas.guiframe.CategoryManager import CategoryManager
 from sas.dataloader.loader import Loader
+from sas.guiframe.proxy import Connection
 from matplotlib import _pylab_helpers
+
 
 def get_app_dir():
@@ -2052 +2054 @@
         a call-back method when the current version number has been obtained.
         """
-        try:
-            req = urllib2.Request(config.__update_URL__)
-            res = urllib2.urlopen(req)
-            content = res.read().strip()
-            logging.info("Connected to www.sasview.org. Latest version: %s"
-                         % (content))
-            version_info = json.loads(content)
-        except:
-            logging.info("Failed to connect to www.sasview.org")
-            version_info = {"version": "0.0.0"}
-        self._process_version(version_info, standalone=event == None)
+        version_info = {"version": "0.0.0"}
+        c = Connection(config.__update_URL__, config.UPDATE_TIMEOUT)
+        response = c.connect()
+        if response is not None:
+            try:
+                # 
+                content = response.read().strip()
+                logging.info("Connected to www.sasview.org. Latest version: %s"
+                             % (content))
+                version_info = json.loads(content)
+            except:
+                logging.info("Failed to connect to www.sasview.org")
+        self._process_version(version_info, standalone=event == None)    
+
+        
+        
+#         
+#         try:
+#             req = urllib2.Request(config.__update_URL__)
+#             res = urllib2.urlopen(req)
+#             content = res.read().strip()
+#             logging.info("Connected to www.sasview.org. Latest version: %s"
+#                          % (content))
+#             version_info = json.loads(content)
+#         except:
+#             logging.info("Failed to connect to www.sasview.org")
+#             version_info = {"version": "0.0.0"}
+#         self._process_version(version_info, standalone=event == None)
 
     def _process_version(self, version_info, standalone=True):