Add import calculate.contrib for suds

pym/consolegui/application/ConnectionTabs.py

@@ -19,8 +19,8 @@ import dbus.service
 import dbus.mainloop.glib
 
 from calculate.consolegui import qt
-# import sudsds, time, sys
 import time, sys
+import calculate.contrib
 from suds import MethodNotFound
 import os, pwd, shutil
 import ConfigParser
@@ -96,7 +96,6 @@ class SelectedMethodWgt(qt.QWidget):
                                      self.args.method + '_view', step = 0)
             view = self.ClientObj.client.service[0][self.args.method + \
                                 '_view'](int(self.ClientObj.sid), view_params)
-        # except sudsds.MethodNotFound:
         except MethodNotFound:
             _print('Method not found: ', self.args.method + '_view')
             self.close()

pym/consolegui/application/MainFrameResult.py

@@ -23,8 +23,8 @@ def debug(level, *args):
         for s in args:
             print s,
         print
-# import urllib2, sudsds
 import urllib2
+import calculate.contrib
 from suds import MethodNotFound
 import re
 
@@ -256,7 +256,6 @@ class MainFrameRes(qt.QWidget):
                                        table.onClick + '_view', step = 0) #int(table.step) if table.step else 0)
                 view = self.client.service[0][table.onClick + '_view'](
                     sid, view_params)
-            # except sudsds.MethodNotFound, e:
             except MethodNotFound, e:
                 _print(e)
                 return
@@ -380,7 +379,6 @@ class MainFrameRes(qt.QWidget):
                                        self.method_name + '_view', step = None)
                 view = self.client.service[0][self.method_name + '_view'] \
                                                     (sid, view_params)
-            # except sudsds.MethodNotFound:
             except MethodNotFound:
                 return
             #if self._parent.ClientObj.method_names.has_key(self.method_name):

pym/consolegui/application/client_class.py

@@ -21,10 +21,7 @@ if hasattr(u2,"ssl"):
 import os, re, sys
 from calculate.core.datavars import DataVarsCore
 
-# from sudsds.transport.http import HttpTransport, SUDSHTTPRedirectHandler, \
-#             CheckingHTTPSConnection, CheckingHTTPSHandler, \
-#             PYOPENSSL_AVAILABLE, PyOpenSSLSocket
-
+import calculate.contrib
 from suds.transport.http import HttpTransport
 
 try:

pym/consolegui/application/conf_connection.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 from calculate.consolegui import qt
-# from sudsds import WebFault
+import calculate.contrib
 from suds import WebFault
 import logging, OpenSSL
 import ConfigParser, os, urllib2

pym/consolegui/application/mainframe.py

@@ -24,7 +24,7 @@ from more import show_msg, LabelWordWrap, MultipleChoice, SelectTable, \
     ExpertWidget, ButtonsWidget, show_question, PlusRow, \
     ReadonlyCheckBox, get_view_params, ImageLabel, SelectList, \
     QComboWgt, _print, get_system_rgb, ParameterWindow, get_icon
-# from sudsds import WebFault
+import calculate.contrib
 from suds import WebFault
 from calculate.lib.utils.text import _u8
 from calculate.lib.utils.tools import Sizes