Merge branch 'master' into dan_stateless

1 files changed, 0 insertions, 122 deletions

diff --git a/external_libs/python/jsonrpclib-pelix-0.2.5/jsonrpclib/utils.py b/external_libs/python/jsonrpclib-pelix-0.2.5/jsonrpclib/utils.py
deleted file mode 100644
index 31183742..00000000
--- a/external_libs/python/jsonrpclib-pelix-0.2.5/jsonrpclib/utils.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/python
-# -- Content-Encoding: UTF-8 --
-"""
-Utility methods, for compatibility between Python version
-
-:author: Thomas Calmant
-:copyright: Copyright 2015, isandlaTech
-:license: Apache License 2.0
-:version: 0.2.5
-
-..
-
-    Copyright 2015 isandlaTech
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-"""
-
-# Module version
-__version_info__ = (0, 2, 5)
-__version__ = ".".join(str(x) for x in __version_info__)
-
-# Documentation strings format
-__docformat__ = "restructuredtext en"
-
-# ------------------------------------------------------------------------------
-
-import sys
-
-# ------------------------------------------------------------------------------
-
-if sys.version_info[0] < 3:
-    # Python 2
-    import types
-    try:
-        string_types = (
-            types.StringType,
-            types.UnicodeType
-        )
-    except NameError:
-        # Python built without unicode support
-        string_types = (types.StringType,)
-
-    numeric_types = (
-        types.IntType,
-        types.LongType,
-        types.FloatType
-    )
-
-    def to_bytes(string):
-        """
-        Converts the given string into bytes
-        """
-        if type(string) is unicode:
-            return str(string)
-        return string
-
-    def from_bytes(data):
-        """
-        Converts the given bytes into a string
-        """
-        if type(data) is str:
-            return data
-        return str(data)
-
-else:
-    # Python 3
-    string_types = (
-        bytes,
-        str
-    )
-
-    numeric_types = (
-        int,
-        float
-    )
-
-    def to_bytes(string):
-        """
-        Converts the given string into bytes
-        """
-        if type(string) is bytes:
-            return string
-        return bytes(string, "UTF-8")
-
-    def from_bytes(data):
-        """
-        Converts the given bytes into a string
-        """
-        if type(data) is str:
-            return data
-        return str(data, "UTF-8")
-
-# ------------------------------------------------------------------------------
-# Common
-
-DictType = dict
-
-ListType = list
-TupleType = tuple
-
-iterable_types = (
-    list,
-    set, frozenset,
-    tuple
-)
-
-value_types = (
-    bool,
-    type(None)
-)
-
-primitive_types = string_types + numeric_types + value_types