From d254fe791ad57387496eb51dde92a3ec0b6e5752 Mon Sep 17 00:00:00 2001
From: Shadab Zafar <dufferzafar0@gmail.com>
Date: Tue, 7 Jun 2016 11:45:38 +0530
Subject: Py3: Fix a test_language_writer test by using a byte literal

---
 test/pathod/test_language_writer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/pathod/test_language_writer.py b/test/pathod/test_language_writer.py
index c02f66f3..e857e084 100644
--- a/test/pathod/test_language_writer.py
+++ b/test/pathod/test_language_writer.py
@@ -87,4 +87,4 @@ def test_write_values_after():
     s = BytesIO()
     r = next(language.parse_pathod("400:ia,'xx'"))
     language.serve(r, s, {})
-    assert s.getvalue().endswith('xx')
+    assert s.getvalue().endswith(b'xx')
-- 
cgit v1.2.3


From c98c83190baa078539b79136c2de348985cc61cc Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Tue, 7 Jun 2016 00:23:07 -0700
Subject: tests++

---
 test/netlib/test_strutils.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/netlib/test_strutils.py b/test/netlib/test_strutils.py
index 734265c4..84a0dded 100644
--- a/test/netlib/test_strutils.py
+++ b/test/netlib/test_strutils.py
@@ -1,6 +1,18 @@
 # coding=utf-8
+import six
 
-from netlib import strutils
+from netlib import strutils, tutils
+
+
+def test_native():
+    with tutils.raises(TypeError):
+        strutils.native(42)
+    if six.PY2:
+        assert strutils.native(u"foo") == b"foo"
+        assert strutils.native(b"foo") == b"foo"
+    else:
+        assert strutils.native(u"foo") == u"foo"
+        assert strutils.native(b"foo") == u"foo"
 
 
 def test_clean_bin():
@@ -29,6 +41,9 @@ def test_bytes_to_escaped_str():
     assert strutils.bytes_to_escaped_str(b"'") == r"\'"
     assert strutils.bytes_to_escaped_str(b'"') == r'"'
 
+    with tutils.raises(ValueError):
+        strutils.bytes_to_escaped_str(u"such unicode")
+
 
 def test_escaped_str_to_bytes():
     assert strutils.escaped_str_to_bytes("foo") == b"foo"
@@ -39,6 +54,13 @@ def test_escaped_str_to_bytes():
     assert strutils.escaped_str_to_bytes(u"&!?=\\\\)") == br"&!?=\)"
     assert strutils.escaped_str_to_bytes(u"ü") == b'\xc3\xbc'
 
+    if six.PY2:
+        with tutils.raises(ValueError):
+            strutils.escaped_str_to_bytes(42)
+    else:
+        with tutils.raises(ValueError):
+            strutils.escaped_str_to_bytes(b"very byte")
+
 
 def test_isBin():
     assert not strutils.isBin("testing\n\r")
-- 
cgit v1.2.3