From f2a6970b2266105bb04d6b49c694d6c3f0b59acc Mon Sep 17 00:00:00 2001
From: darius BERNARD <darius@yupeek.com>
Date: Thu, 4 May 2017 11:19:24 +0200
Subject: [PATCH] added full unicode string type inside booleano.

---
 src/booleano/__init__.py                         |  1 +
 src/booleano/operations/__init__.py              |  1 +
 src/booleano/operations/converters.py            |  2 ++
 src/booleano/operations/operands/__init__.py     |  2 ++
 src/booleano/operations/operands/classes.py      |  1 +
 src/booleano/operations/operands/constants.py    |  3 ++-
 src/booleano/operations/operands/placeholders.py |  5 +++--
 src/booleano/operations/operators.py             |  1 +
 src/booleano/parser/__init__.py                  |  1 +
 src/booleano/parser/grammar.py                   |  1 +
 src/booleano/parser/parsers.py                   |  1 +
 src/booleano/parser/scope.py                     |  1 +
 src/booleano/parser/testutils.py                 |  2 ++
 src/booleano/parser/trees.py                     |  1 +
 tests/__init__.py                                | 12 +++++++++++-
 tests/operations/test_converters.py              |  2 ++
 tests/operations/test_operands.py                |  1 +
 tests/operations/test_operators.py               |  1 +
 tests/parsing/test_grammar.py                    |  1 +
 tests/parsing/test_managers.py                   |  7 +++++--
 tests/parsing/test_parsers.py                    |  1 +
 tests/parsing/test_scope.py                      |  1 +
 tests/parsing/test_trees.py                      |  1 +
 23 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/booleano/__init__.py b/src/booleano/__init__.py
index 96d2e64..82861dc 100644
--- a/src/booleano/__init__.py
+++ b/src/booleano/__init__.py
@@ -28,6 +28,7 @@
 
 # Namespace package here! See:
 # http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+from __future__ import unicode_literals
 try: #pragma: no cover
     __import__('pkg_resources').declare_namespace(__name__)
 except ImportError: #pragma: no cover
diff --git a/src/booleano/operations/__init__.py b/src/booleano/operations/__init__.py
index d34c4e4..8dfb673 100644
--- a/src/booleano/operations/__init__.py
+++ b/src/booleano/operations/__init__.py
@@ -34,6 +34,7 @@
 using the classes provided by this package.
 
 """
+from __future__ import unicode_literals
 import six
 
 from booleano.exc import InvalidOperationError
diff --git a/src/booleano/operations/converters.py b/src/booleano/operations/converters.py
index 20b74e0..e220828 100644
--- a/src/booleano/operations/converters.py
+++ b/src/booleano/operations/converters.py
@@ -30,6 +30,8 @@
 evaluable ones).
 
 """
+from __future__ import unicode_literals
+
 from booleano.exc import ConversionError
 from booleano.operations import (And, BelongsTo, Equal, GreaterEqual,
                                  GreaterThan, IsSubset, LessEqual, LessThan,
diff --git a/src/booleano/operations/operands/__init__.py b/src/booleano/operations/operands/__init__.py
index 32db145..2c8e092 100644
--- a/src/booleano/operations/operands/__init__.py
+++ b/src/booleano/operations/operands/__init__.py
@@ -29,8 +29,10 @@
 Booleano operands.
 
 """
+from __future__ import unicode_literals
 import six
 
+
 from booleano.operations import OPERATIONS, OperationNode
 from booleano.exc import InvalidOperationError, BadOperandError
 
diff --git a/src/booleano/operations/operands/classes.py b/src/booleano/operations/operands/classes.py
index 197f367..b4f61ab 100644
--- a/src/booleano/operations/operands/classes.py
+++ b/src/booleano/operations/operands/classes.py
@@ -35,6 +35,7 @@
 **Python classes and Booleano classes are two different things!**
 
 """
+from __future__ import unicode_literals
 from collections import OrderedDict
 
 import six
diff --git a/src/booleano/operations/operands/constants.py b/src/booleano/operations/operands/constants.py
index 6688fcf..9454fed 100644
--- a/src/booleano/operations/operands/constants.py
+++ b/src/booleano/operations/operands/constants.py
@@ -29,6 +29,7 @@
 Constant operands.
 
 """
+from __future__ import unicode_literals
 import six
 
 from booleano.exc import InvalidOperationError
@@ -157,7 +158,7 @@ def __str__(self):
     
     def __repr__(self):
         """Return the representation for this constant string."""
-        return '<String "%s">' % self.constant_value.encode("utf-8")
+        return '<String "%s">' % self.constant_value
 
 
 @six.python_2_unicode_compatible
diff --git a/src/booleano/operations/operands/placeholders.py b/src/booleano/operations/operands/placeholders.py
index 91f840c..7cbc920 100644
--- a/src/booleano/operations/operands/placeholders.py
+++ b/src/booleano/operations/operands/placeholders.py
@@ -33,6 +33,7 @@
 parser won't verify its existence.
 
 """
+from __future__ import unicode_literals
 import six
 
 from booleano.exc import BadCallError, InvalidOperationError
@@ -120,7 +121,7 @@ def __str__(self):
     
     def __repr__(self):
         """Return the representation for this placeholder variable."""
-        msg = '<Placeholder variable "%s"' % self.name.encode("utf-8")
+        msg = '<Placeholder variable "%s"' % self.name
         if self.namespace_parts:
             ns = self._namespace_to_ascii()
             msg = '%s at namespace="%s"' % (msg, ns)
@@ -183,7 +184,7 @@ def __repr__(self):
         """Return the representation for this placeholder function."""
         args = [repr(arg) for arg in self.arguments]
         args = ", ".join(args)
-        func_name = self.name.encode("utf-8")
+        func_name = self.name
         msg = '<Placeholder function call "%s"(%s)' % (func_name, args)
         if self.namespace_parts:
             ns = self._namespace_to_ascii()
diff --git a/src/booleano/operations/operators.py b/src/booleano/operations/operators.py
index 1fd3e6e..8bbf7a6 100644
--- a/src/booleano/operations/operators.py
+++ b/src/booleano/operations/operators.py
@@ -29,6 +29,7 @@
 Built-in operators.
 
 """
+from __future__ import unicode_literals
 import six
 
 
diff --git a/src/booleano/parser/__init__.py b/src/booleano/parser/__init__.py
index 5625fd6..9e3265a 100644
--- a/src/booleano/parser/__init__.py
+++ b/src/booleano/parser/__init__.py
@@ -30,6 +30,7 @@
 
 """
 
+from __future__ import unicode_literals
 from logging import getLogger
 
 from booleano.parser.parsers import EvaluableParser, ConvertibleParser
diff --git a/src/booleano/parser/grammar.py b/src/booleano/parser/grammar.py
index ef13c7b..c3b3c15 100644
--- a/src/booleano/parser/grammar.py
+++ b/src/booleano/parser/grammar.py
@@ -29,6 +29,7 @@
 Adaptive grammar definition and handling.
 
 """
+from __future__ import unicode_literals
 
 from booleano.exc import GrammarError
 
diff --git a/src/booleano/parser/parsers.py b/src/booleano/parser/parsers.py
index bdc2bd3..f837f92 100644
--- a/src/booleano/parser/parsers.py
+++ b/src/booleano/parser/parsers.py
@@ -30,6 +30,7 @@
 
 """
 
+from __future__ import unicode_literals
 import re
 
 import six
diff --git a/src/booleano/parser/scope.py b/src/booleano/parser/scope.py
index b20d67f..daf19bb 100644
--- a/src/booleano/parser/scope.py
+++ b/src/booleano/parser/scope.py
@@ -29,6 +29,7 @@
 Booleano scope handling.
 
 """
+from __future__ import unicode_literals
 
 from logging import getLogger
 
diff --git a/src/booleano/parser/testutils.py b/src/booleano/parser/testutils.py
index 936c08e..d4407cb 100644
--- a/src/booleano/parser/testutils.py
+++ b/src/booleano/parser/testutils.py
@@ -29,6 +29,8 @@
 Semi-automatic utilities to test Booleano grammars and parsers.
 
 """
+from __future__ import unicode_literals
+
 from nose.tools import eq_, ok_, raises
 from pyparsing import ParseException
 
diff --git a/src/booleano/parser/trees.py b/src/booleano/parser/trees.py
index 17d4890..064239b 100644
--- a/src/booleano/parser/trees.py
+++ b/src/booleano/parser/trees.py
@@ -36,6 +36,7 @@
   SQL "WHERE" clauses) using so-called parse tree converters.
 
 """
+from __future__ import unicode_literals
 import six
 
 __all__ = ("EvaluableParseTree", "ConvertibleParseTree")
diff --git a/tests/__init__.py b/tests/__init__.py
index e3b421a..03d28ef 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -32,10 +32,19 @@
 
 """
 
+from __future__ import unicode_literals
+import six
+
+if six.PY2:  # pragma: nocover
+    import sys
+    reload(sys)
+    sys.setdefaultencoding("utf-8")
+
+
 import logging
 from collections import OrderedDict
 
-import six
+
 
 from booleano.operations.converters import BaseConverter
 from booleano.operations import (Not, And, Or, Xor, Equal, NotEqual, LessThan,
@@ -224,6 +233,7 @@ def __init__(self, *args, **kwargs):
         logging.Handler.__init__(self, *args, **kwargs)
 
     def emit(self, record):
+        print("received message %s %s"% (record.levelname, record.getMessage()))
         self.messages[record.levelname.lower()].append(record.getMessage())
     
     def reset(self):
diff --git a/tests/operations/test_converters.py b/tests/operations/test_converters.py
index 105e239..a53b0c5 100644
--- a/tests/operations/test_converters.py
+++ b/tests/operations/test_converters.py
@@ -29,6 +29,8 @@
 Tests for the parse tree converters.
 
 """
+from __future__ import unicode_literals
+
 from nose.tools import eq_, assert_raises, raises
 
 from booleano.operations.converters import BaseConverter
diff --git a/tests/operations/test_operands.py b/tests/operations/test_operands.py
index 079aab4..11c2795 100644
--- a/tests/operations/test_operands.py
+++ b/tests/operations/test_operands.py
@@ -29,6 +29,7 @@
 Tests for unbounded operands.
 
 """
+from __future__ import unicode_literals
 
 from nose.tools import eq_, ok_, assert_false, assert_raises, raises
 import six
diff --git a/tests/operations/test_operators.py b/tests/operations/test_operators.py
index 054a5b4..472dd60 100644
--- a/tests/operations/test_operators.py
+++ b/tests/operations/test_operators.py
@@ -29,6 +29,7 @@
 Tests for the operators.
 
 """
+from __future__ import unicode_literals
 
 from nose.tools import eq_, ok_, assert_false, assert_raises, raises
 import six
diff --git a/tests/parsing/test_grammar.py b/tests/parsing/test_grammar.py
index 01aede1..252f8a8 100644
--- a/tests/parsing/test_grammar.py
+++ b/tests/parsing/test_grammar.py
@@ -29,6 +29,7 @@
 Test suite for the grammar configurations.
 
 """
+from __future__ import unicode_literals
 
 from nose.tools import eq_, ok_, assert_raises
 
diff --git a/tests/parsing/test_managers.py b/tests/parsing/test_managers.py
index 8654736..6cc17f3 100644
--- a/tests/parsing/test_managers.py
+++ b/tests/parsing/test_managers.py
@@ -29,6 +29,7 @@
 Tests for the parsing managers.
 
 """
+from __future__ import unicode_literals
 
 from nose.tools import eq_, ok_, assert_false, assert_raises
 
@@ -115,7 +116,9 @@ def test_parsing_with_undefined_grammar_but_available_translations(self):
             LessEqual(PedestriansCrossingRoad(), Number(3)))
         eq_(parse_tree, expected_tree)
         # Checking the log:
-        info = "Generated parser for unknown grammar 'es'"
+        info = "Generated parser for unknown grammar u'es'"
+        print(log_handler.handler.messages)
+
         ok_(info in log_handler.handler.messages['info'])
         log_handler.undo()
     
@@ -135,7 +138,7 @@ def test_parsing_with_undefined_grammar_and_no_translated_bindings(self):
             LessEqual(PedestriansCrossingRoad(), Number(3)))
         eq_(parse_tree, expected_tree)
         # Checking the log:
-        info = "Generated parser for unknown grammar 'fr'"
+        info = "Generated parser for unknown grammar u'fr'"
         ok_(info in log_handler.handler.messages['info'])
         log_handler.undo()
     
diff --git a/tests/parsing/test_parsers.py b/tests/parsing/test_parsers.py
index 1c7bb26..8da60e7 100644
--- a/tests/parsing/test_parsers.py
+++ b/tests/parsing/test_parsers.py
@@ -29,6 +29,7 @@
 Test suite for the built-in parser implementation.
 
 """
+from __future__ import unicode_literals
 
 from nose.tools import eq_, assert_raises
 import six
diff --git a/tests/parsing/test_scope.py b/tests/parsing/test_scope.py
index 9c420b6..b529231 100644
--- a/tests/parsing/test_scope.py
+++ b/tests/parsing/test_scope.py
@@ -29,6 +29,7 @@
 Scope handling tests.
 
 """
+from __future__ import unicode_literals
 
 from nose.tools import eq_, ok_, assert_false, assert_raises, raises
 import six
diff --git a/tests/parsing/test_trees.py b/tests/parsing/test_trees.py
index 905bc51..8579f12 100644
--- a/tests/parsing/test_trees.py
+++ b/tests/parsing/test_trees.py
@@ -29,6 +29,7 @@
 Tests for the parse trees.
 
 """
+from __future__ import unicode_literals
 
 from nose.tools import eq_, ok_, assert_false, assert_raises, raises
 import six