Merge pull request #472 from enthought/fix/str-rfind

Fix failure of str_rfind for Unicode inputs

Author: mdickinson

CHANGES.rst

@@ -1,6 +1,16 @@
 Traits CHANGELOG
 ================
 
+Release 5.1.1
+-------------
+
+Released: 2019-04-18
+
+Fixes
+
+* Revert a change (#449) which accidentally broke external uses of
+  ``_py2to3.str_find`` and ``_py2to3.str_rfind``. (#472)
+
 Release 5.1.0
 -------------
 

traits/_py2to3.py

@@ -17,8 +17,15 @@
 # use from traitsui.
 # Once that PR is merged and a new release of traitsui is available, we can
 # remove these aliases for good.
-str_find = str.find
-str_rfind = str.rfind
+if six.PY2:
+    import string
+
+    str_find = string.find
+    str_rfind = string.rfind
+else:
+    str_find = str.find
+    str_rfind = str.rfind
+
 
 if six.PY2:
     from types import InstanceType, ClassType
@@ -80,10 +87,10 @@ def nested_context_mgrs(*args):
 
     class nested_context_mgrs(ExitStack):
         """ Emulation of python 2's :py:class:`contextlib.nested`.
-        
+
         It has gone from python 3 due to it's deprecation status
         in python 2.
-        
+
         Note that :py:class:`contextlib.nested` was deprecated for
         a reason: It has issues with context managers that fail
         during init. The same caveats also apply here.

traits/tests/test__py2to3.py

@@ -0,0 +1,42 @@
+#  Copyright (c) 2007, Enthought, Inc.
+#  All rights reserved.
+#
+#  This software is provided without warranty under the terms of the BSD
+#  license included in /LICENSE.txt and may be redistributed only
+#  under the conditions described in the aforementioned license.  The license
+#  is also available online at http://www.enthought.com/licenses/BSD.txt
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import unittest
+
+import six
+
+from traits._py2to3 import str_find, str_rfind
+
+
+class TestPy2to3(unittest.TestCase):
+    def test_str_find(self):
+        # Note: inputs are Unicode strings.
+        self.assertEqual(str_find("abcabc", "c"), 2)
+        self.assertEqual(str_find("abcabc", "d"), -1)
+
+    def test_str_rfind(self):
+        # Note: inputs are Unicode strings.
+        self.assertEqual(str_rfind("abcabc", "c"), 5)
+        self.assertEqual(str_rfind("abcabc", "d"), -1)
+
+    if six.PY2:
+        def test_str_find_with_bytestrings(self):
+            # Try all possible mixes of Unicode with bytes.
+            self.assertEqual(str_find("abcabc", "b"), 1)
+            self.assertEqual(str_find(u"abcabc", "b"), 1)
+            self.assertEqual(str_find("abcabc", u"b"), 1)
+            self.assertEqual(str_find(u"abcabc", u"b"), 1)
+
+        def test_str_rfind_with_bytestrings(self):
+            # Try all possible mixes of Unicode with bytes.
+            self.assertEqual(str_rfind("abcabc", "b"), 4)
+            self.assertEqual(str_rfind(u"abcabc", "b"), 4)
+            self.assertEqual(str_rfind("abcabc", u"b"), 4)
+            self.assertEqual(str_rfind(u"abcabc", u"b"), 4)