Merge remote branch 'origin/develop'

core/server/clean.py

@@ -15,10 +15,8 @@
 #  limitations under the License.
 
 import os, glob, sys
-import signal
 import time, datetime
 import pickle
-import soaplib
 from calculate.core.datavars import DataVarsCore
 from calculate.lib.cl_lang import setLocalTranslate
 setLocalTranslate('cl_core',sys.modules[__name__])
@@ -53,7 +51,7 @@ class CoreWsdl:
             self._delete_pid(sid, pid)
         except IOError:
             print 'Except IOError'
-        except Exception, e:
+        except Exception:
             print _("watcher process pid %d error") %pid
             try:
                 self._delete_pid(sid, pid)
@@ -76,7 +74,7 @@ def monitor(certbase, SID_FILE):
     # set default
     period = 180
     sid_live = 240
-    cert_live = 10080
+#    cert_live = 10080
     # Get value of period and lifetime session from DataVars
     try:
         ob = DataVarsCore()
@@ -95,7 +93,6 @@ def monitor(certbase, SID_FILE):
     while True:
         # check session
         try:
-            rst = []
             SID_FILE_T = SID_FILE + '_temp'
             fd = open(SID_FILE, 'r')
             ft = open(SID_FILE_T, 'w')

setup.py

@@ -29,10 +29,6 @@ import distutils.command.install_egg_info
 var_data_files = []
 
 data_files = [('/etc/init.d', ['scripts/calculate-core'])]
-for size in [16,22,48,64,72,96,128]:
-    data_files.append(('/usr/share/icons/Calculate/%dx%d' %(size,size),
-                   glob.glob('data/%dx%d/cl-core.png' %(size,size))))
-
 
 __version__ = "0.1"
 __app__ = "calculate-core"