use items instead of iteritems.

Use platform.system instead of os.name.
Update comment on sample json config.
Move configuration to dedicated script.

Author: Dorian Birraux

wolframclient/evaluation/kernel/kernelsession.py

@@ -29,10 +29,7 @@
     3: logging.WARN,
     4: logging.FATAL
 }
-if six.PY2:
-    FROM_PY_LOG_LEVEL = dict((v, k) for k, v in TO_PY_LOG_LEVEL.iteritems())
-else:
-    FROM_PY_LOG_LEVEL = dict((v, k) for k, v in TO_PY_LOG_LEVEL.items())
+FROM_PY_LOG_LEVEL = dict((v, k) for k, v in TO_PY_LOG_LEVEL.items())
 
 class KernelLogger(Thread):
 

wolframclient/tests/__init__.py

@@ -1,39 +1,6 @@
 # -*- coding: utf-8 -*-
-import json
-from wolframclient.logger.utils import setup_logging_to_file
-from wolframclient.utils.api import os
-__all__ = [ 'create_dir_if_missing', 'dir_test_data', 'json_config' ]
+from __future__ import absolute_import, print_function, unicode_literals
 
-def create_dir_if_missing(path):
-    ''' Create the directory structure represented by a `path`.
-    
-    Path can represent a file or a directory depending if it ends with
-    a path separator.
-    
-    If the path represents a file, the parent directory is created, otherwise
-    the directory itself is created.
-    '''
-    file_dir = os.dirname(path)
-    if not os.exists(file_dir):
-        os.makedirs(file_dir)
+from wolframclient.tests.configure import json_config, create_dir_if_missing, dir_test_data
 
-def dir_test_data():
-    ''' Return path to the data directory in tests'''
-    current_file_dir = os.dirname(__file__)
-    return os.path_join(current_file_dir, 'data')
-
-
-log_file = os.environ.get('WOLFRAMCLIENT_PY_LOG_FILE', None)
-if log_file is not None:
-    create_dir_if_missing(log_file)
-    setup_logging_to_file(log_file)
-
-json_config=None
-json_config_path = os.environ.get('WOLFRAMCLIENT_PY_JSON_CONFIG', None)
-if json_config_path is not None:
-    expended_path = os.expanduser(os.expandvars(json_config_path))
-    try:
-        with open(expended_path, 'r') as fp:
-            json_config = json.load(fp)
-    except:
-        raise ValueError('Failed to find json configuration file %s' % json_config_path)
+__all__ = ['create_dir_if_missing', 'dir_test_data', 'json_config']

wolframclient/tests/configure.py

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, print_function, unicode_literals
+import json
+
+from wolframclient.logger.utils import setup_logging_to_file
+from wolframclient.utils.api import os
+
+__all__ = ['create_dir_if_missing', 'dir_test_data', 'json_config']
+
+
+def create_dir_if_missing(path):
+    ''' Create the directory structure represented by a `path`.
+    
+    Path can represent a file or a directory depending if it ends with
+    a path separator.
+    
+    If the path represents a file, the parent directory is created, otherwise
+    the directory itself is created.
+    '''
+    file_dir = os.dirname(path)
+    if not os.exists(file_dir):
+        os.makedirs(file_dir)
+
+
+def dir_test_data():
+    ''' Return path to the data directory in tests'''
+    current_file_dir = os.dirname(__file__)
+    return os.path_join(current_file_dir, 'data')
+
+log_file = os.environ.get('WOLFRAMCLIENT_PY_LOG_FILE', None)
+if log_file is not None:
+    create_dir_if_missing(log_file)
+    setup_logging_to_file(log_file)
+
+json_config = None
+_json_config_path = os.environ.get('WOLFRAMCLIENT_PY_JSON_CONFIG', None)
+if _json_config_path is not None:
+    expended_path = os.expanduser(os.expandvars(_json_config_path))
+    try:
+        with open(expended_path, 'r') as fp:
+            json_config = json.load(fp)
+    except:
+        raise ValueError(
+            'Failed to find json configuration file %s' % _json_config_path)

wolframclient/tests/local_config_sample.json

@@ -1,7 +1,6 @@
-// this json file is used by the test suite to connect to the Wolfram 
-// public cloud and to evaluate expressions to a local kernel.
-// It has to be renamed to local_config.json and edited with correct
-// local configuration.
+// this json file is used by the test suite to connect to the Wolfram public cloud 
+// and to evaluate expressions to a local kernel. 
+// It's path is specified with the environment variable WOLFRAMCLIENT_PY_JSON_CONFIG
 {
     "kernel" : "/path/to/WolframKernel",
     "cloud_credentials" : {

wolframclient/utils/six.py

@@ -5,6 +5,7 @@
 from itertools import chain
 
 import datetime
+import platform
 import decimal
 import sys
 import os
@@ -15,7 +16,7 @@
 PY2 = sys.version_info[0] == 2
 PY3 = sys.version_info[0] == 3
 
-WINDOWS = os.name == 'nt'
+WINDOWS = platform.system() == 'Windows'
 
 JYTHON = sys.platform.startswith('java')
 
@@ -62,4 +63,4 @@
         integer_types,
         (float, decimal.Decimal, datetime.date, datetime.datetime, datetime.time, bool, none_type)
     )
-)
+)