Changeset c00a797a in sasview for src/sas/sasgui/guiframe

Timestamp:

May 1, 2017 10:23:44 AM (8 years ago)

Author:

GitHub <noreply@…>

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

658dd57, c551bb3, 0cc77d8

Parents:

b636dfc5 (diff), aaf5e49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (05/01/17 10:23:44)

git-committer:

GitHub <noreply@…> (05/01/17 10:23:44)

Message:

Merge pull request #68 from andyfaff/print

MAINT: print statement to print function

Location:

src/sas/sasgui/guiframe

Files:

• config.py (modified) (2 diffs)
• data_panel.py (modified) (3 diffs)
• data_processor.py (modified) (2 diffs)
• dummyapp.py (modified) (2 diffs)
• gui_style.py (modified) (2 diffs)
• proxy.py (modified) (2 diffs)

src/sas/sasgui/guiframe/config.py

@@ -2 +2 @@
     Application settings
 """
+from __future__ import print_function
+
 import time
 import os
@@ -150 +152 @@
         :TODO - Need method doc string
         """
-        print "%g:  %s" % (time.clock(), message)
+        print("%g:  %s" % (time.clock(), message))
 
         if __EVT_DEBUG_2_FILE__:

src/sas/sasgui/guiframe/data_panel.py

@@ -11 +11 @@
 This module provides Graphic interface for the data_manager module.
 """
+from __future__ import print_function
+
 import wx
 from wx.build import build_options
@@ -514 +516 @@
                 self.parent.save_data2d(data, default_name)
             else:
-                print "unable to save this type of data"
+                print("unable to save this type of data")
 
     def layout_data_list(self):
@@ -1497 +1499 @@
     except:
         # raise
-        print "error", sys.exc_value
+        print("error", sys.exc_value)
 
     app.MainLoop()

src/sas/sasgui/guiframe/data_processor.py

@@ -18 +18 @@
 
 """
+from __future__ import print_function
+
 import os
 import sys
@@ -2035 +2037 @@
         frame.Show(True)
     except:
-        print sys.exc_value
+        print(sys.exc_value)
 
     app.MainLoop()

src/sas/sasgui/guiframe/dummyapp.py

@@ -3 +3 @@
 Allows the user to set an external data manager
 """
+from __future__ import print_function
+
 import sas.sasgui.guiframe.gui_manager as gui_manager
 
@@ -32 +34 @@
         plug_menu.Append(id, '&Do something')
         def _on_do_something(event):
-            print "Do something"
+            print("Do something")
         wx.EVT_MENU(self.parent, id, _on_do_something)
     

src/sas/sasgui/guiframe/gui_style.py

@@ -3 +3 @@
 Provide the style for guiframe
 """
+from __future__ import print_function
+
 import wx
 import os
@@ -79 +81 @@
 if __name__ == "__main__":
   
-    print GUIFRAME.DEFAULT_STYLE
-    print GUIFRAME.FLOATING_PANEL
-    print GUIFRAME.SINGLE_APPLICATION
+    print(GUIFRAME.DEFAULT_STYLE)
+    print(GUIFRAME.FLOATING_PANEL)
+    print(GUIFRAME.SINGLE_APPLICATION)
     style = GUIFRAME.MULTIPLE_APPLICATIONS
     style &= GUIFRAME.PLOTTING_ON
-    print style == GUIFRAME.PLOTTING_ON
+    print(style == GUIFRAME.PLOTTING_ON)
     style1 = GUIFRAME.MULTIPLE_APPLICATIONS
     style1 &= (~GUIFRAME.MANAGER_ON)
-    print style1 == GUIFRAME.DEFAULT_STYLE
-    print style1
+    print(style1 == GUIFRAME.DEFAULT_STYLE)
+    print(style1)

src/sas/sasgui/guiframe/proxy.py

@@ -1 +1 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from __future__ import print_function
+
 import urllib2
 import sys
@@ -157 +159 @@
     response = c.connect()
     if response is not None:
-        print 50 * '-'
+        print(50 * '-')
         content = json.loads(response.read().strip())
         pprint(content)