From b934bd56574af5790f5c138c33eed17e74b0b594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ely=C3=A9zer=20Mendes=20Rezende?= <elyezermr@gmail.com>
Date: Mon, 17 Mar 2014 10:58:55 -0300
Subject: [PATCH] Do not allow invalid characters on test names

---
 ddt.py                  |  6 ++++--
 test/test_functional.py | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/ddt.py b/ddt.py
index 5221c27..ee0096a 100644
--- a/ddt.py
+++ b/ddt.py
@@ -1,6 +1,7 @@
 import inspect
 import json
 import os
+import re
 from functools import wraps
 
 __version__ = '0.7.1'
@@ -67,12 +68,13 @@ def mk_test_name(name, value):
 
     """
     try:
-        return "{0}_{1}".format(name, value)
+        test_name = "{0}_{1}".format(name, value)
     except UnicodeEncodeError:
         # fallback for python2
-        return "{0}_{1}".format(
+        test_name = "{0}_{1}".format(
             name, value.encode('ascii', 'backslashreplace')
         )
+    return re.sub('\W|^(?=\d)', '_', test_name)
 
 
 def ddt(cls):
diff --git a/test/test_functional.py b/test/test_functional.py
index 8effe42..7519fa4 100644
--- a/test/test_functional.py
+++ b/test/test_functional.py
@@ -18,6 +18,18 @@ class Dummy(object):
         return value
 
 
+@ddt
+class DummyInvalidIdentifier():
+    """
+    Dummy class to test the data decorator receiving values invalid characters
+    indentifiers
+    """
+
+    @data('32v2 g #Gmw845h$W b53wi.')
+    def test_data_with_invalid_identifier(self, value):
+        return value
+
+
 @ddt
 class FileDataDummy(object):
     """
@@ -212,9 +224,9 @@ def test_ddt_data_unicode():
                 pass
 
         assert_is_not_none(getattr(mytest, 'test_hello_ascii'))
-        assert_is_not_none(getattr(mytest, 'test_hello_non-ascii-\\u2603'))
+        assert_is_not_none(getattr(mytest, 'test_hello_non_ascii__u2603'))
         assert_is_not_none(
-            getattr(mytest, """test_hello_{u'\\u2603': 'data'}"""))
+            getattr(mytest, """test_hello__u__u2603____data__"""))
 
     elif six.PY3:
 
@@ -225,6 +237,20 @@ def test_ddt_data_unicode():
                 pass
 
         assert_is_not_none(getattr(mytest, 'test_hello_ascii'))
-        assert_is_not_none(getattr(mytest, 'test_hello_non-ascii-\N{SNOWMAN}'))
+        assert_is_not_none(getattr(mytest, 'test_hello_non_ascii__'))
         assert_is_not_none(
-            getattr(mytest, """test_hello_{'\N{SNOWMAN}': 'data'}"""))
+            getattr(mytest, """test_hello________data__"""))
+
+
+def test_feed_data_with_invalid_identifier():
+    """
+    Test that data is fed to the decorated tests
+    """
+    tests = list(filter(is_test, DummyInvalidIdentifier.__dict__))
+    assert_equal(len(tests), 1)
+
+    obj = DummyInvalidIdentifier()
+    method = getattr(obj, tests[0])
+    assert_equal(method.__name__,
+                 'test_data_with_invalid_identifier_32v2_g__Gmw845h_W_b53wi_')
+    assert_equal(method(), '32v2 g #Gmw845h$W b53wi.')