Merge pull request #211 in LCL/wolframclientforpython from bugfix/fix-various-errors to master

* commit '9be450632d9a75837d2130117e5ebd18419116f4':
  init dict with values in oauth
  Fix errors spotted by static analyser.

Author: Dorian Birraux

wolframclient/evaluation/cloud/asynccloudsession.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
+import json
 import logging
 
 from wolframclient.evaluation.base import WolframAsyncEvaluator
@@ -260,7 +261,7 @@ async def perform(self, **kwargs):
 # formatting for http requests, based on aiohttp objects.
 
 
-def _encode_inputs_as_wxf(inputs, multipart, **kwargs):
+def _encode_inputs_as_wxf(form_data, inputs, **kwargs):
     for name, value in inputs.items():
         form_data.add_field(name + "__wxf", export(value, target_format="wxf", **kwargs))
 

wolframclient/evaluation/cloud/oauth.py

@@ -192,17 +192,18 @@ def __init__(
 
     def authenticate(self):
         if logger.isEnabledFor(logging.DEBUG):
-            logger.debug("xauth authentication of user %s", user)
+            logger.debug("xauth authentication of user %s", self.xauth_credentials.user)
         if not self.server.is_xauth():
             raise AuthenticationException(
                 "XAuth is not configured. Missing consumer key and/or secret."
             )
         # todo use xauth server key/secret
         client = self.client_class(self.consumer_key, self.consumer_secret)
-        params = {}
-        params["x_auth_username"] = self.xauth_credentials.user
-        params["x_auth_password"] = self.xauth_credentials.password
-        params["x_auth_mode"] = "client_auth"
+        params = {
+            "x_auth_username": self.xauth_credentials.user,
+            "x_auth_password": self.xauth_credentials.password,
+            "x_auth_mode": "client_auth"
+        }
 
         # avoid dumping password in log files.
         logging.disable(logging.DEBUG)

wolframclient/evaluation/pool.py

@@ -73,7 +73,7 @@ def __init__(
     ):
         super().__init__(loop)
         if poolsize <= 0:
-            raise ValueError("Invalid pool size value %i. Expecting a positive integer." % i)
+            raise ValueError("Invalid pool size value %i. Expecting a positive integer." % poolsize)
         self._queue = asyncio.Queue(load_factor * poolsize, loop=self._loop)
         self.async_language_session_class = async_language_session_class
         self._evaluators = set()

wolframclient/exception.py

@@ -14,7 +14,7 @@ def __init__(self, response, msg=None):
         else:
             try:
                 self.msg = response.text()
-            except UnicodeDecodeErrors:
+            except UnicodeDecodeError:
                 self.msg = "Failed to decode request body."
 
     def __str__(self):

wolframclient/tests/serializers/pandas.py

@@ -28,7 +28,7 @@ def create_numpy_data_nan(self):
 
     def create_numpy_data_zero(self):
         # zero-based
-        arr, index = create_numpy_data_nan()
+        arr, index = self.create_numpy_data_nan()
         arr[numpy.isnan(arr)] = 0
         return arr, index
 

wolframclient/utils/externalevaluate.py

@@ -150,11 +150,11 @@ def evaluate_message(input=None, return_type=None, args=None, **opts):
     return result
 
 
-def handle_message(socket, evaluate_message=evaluate_message, consumer = None):
+def handle_message(socket, evaluate_message=evaluate_message, consumer=None):
 
     __traceback_hidden_variables__ = True
 
-    message = binary_deserialize(socket.recv(), consumer = consumer)
+    message = binary_deserialize(socket.recv(), consumer=consumer)
     result = evaluate_message(**message)
 
     sys.stdout.flush()
@@ -184,7 +184,7 @@ def start_zmq_loop(
     redirect_stdout=True,
     export_kwargs=EXPORT_KWARGS,
     evaluate_message=evaluate_message,
-    consumer = None, 
+    consumer=None,
     **opts
 ):
 
@@ -203,7 +203,7 @@ def start_zmq_loop(
 
     # now sit in a while loop, evaluating input
     while messages < message_limit:
-        stream.write(handler(socket, evaluate_message=evaluate_message, consumer = consumer))
+        stream.write(handler(socket, evaluate_message=evaluate_message, consumer=consumer))
         messages += 1
 
     if redirect_stdout: