Should solve issue #24 on older configuration files (no future import)

proycon · Feb 8, 2016 · 36f66e0 · 36f66e0
1 parent b597a8c
commit 36f66e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/clam/clamservice.py b/clam/clamservice.py
@@ -2400,6 +2400,11 @@ def set_defaults():
         if not s in settingkeys:
             error("ERROR: Service configuration incomplete, missing setting: " + s)
 
+    if sys.version < '3':
+        if isinstance(settingkeys['SYSTEM_DESCRIPTION'],str):
+            settings.SYSTEM_DESCRIPTION = unicode(settingkeys['SYSTEM_DESCRIPTION'],'utf-8') #pylint: disable=undefined-variable
+        if isinstance(settingkeys['SYSTEM_NAME'],str):
+            settings.SYSTEM_NAME = unicode(settingkeys['SYSTEM_NAME'],'utf-8') #pylint: disable=undefined-variable
 
 
     if 'ROOT' in settingkeys and settings.ROOT and not settings.ROOT[-1] == "/":

diff --git a/clam/config/textstats3.py b/clam/config/textstats3.py
@@ -37,7 +37,7 @@
 SYSTEM_NAME = "Text Statistics (CLAM Demo)"
 
 #An informative description for this system:
-SYSTEM_DESCRIPTION = "This webservice computes several statistics for plaintext files. It is a demo for CLAM."
+SYSTEM_DESCRIPTION = "This webservice computes several statistics for plaintext files. It is a demo for CLAM. Это демо для Клам.."
 
 # ======== LOCATION ===========