Merge branch 'fix_string_contains_case_insensitive_with_no_regex' of https://github.com/benjwadams/pandas into benjwadams-fix_string_contains_case_insensitive_with_no_regex

Conflicts:
	doc/source/v0.14.1.txt

Author: jreback

doc/source/v0.14.1.txt

@@ -158,10 +158,10 @@ Experimental
 ~~~~~~~~~~~~
 
 - ``io.gbq.read_gbq`` and ``io.gbq.to_gbq`` were refactored to remove the
-  dependency on the Google ``bq.py`` command line client. This submodule 
-  now uses ``httplib2`` and the Google ``apiclient`` and ``oauth2client`` API client 
-  libraries which should be more stable and, therefore, reliable than 
-  ``bq.py`` (:issue:`6937`).  
+  dependency on the Google ``bq.py`` command line client. This submodule
+  now uses ``httplib2`` and the Google ``apiclient`` and ``oauth2client`` API client
+  libraries which should be more stable and, therefore, reliable than
+  ``bq.py`` (:issue:`6937`).
 
 .. _whatsnew_0141.bug_fixes:
 
@@ -267,3 +267,4 @@ Bug Fixes
 - Bug in ``DatetimeIndex.intersection`` doesn't preserve timezone (:issue:`4690`)
 
 - Bug in ``Float64Index`` assignment with a non scalar indexer (:issue:`7586`)
+- Bug in ``pandas.core.strings.str_contains`` does not properly match in a case insensitive fashion when ``regex=False`` and ``case=False`` (:issue:`7505`)

pandas/core/strings.py

@@ -189,7 +189,12 @@ def str_contains(arr, pat, case=True, flags=0, na=np.nan, regex=True):
 
         f = lambda x: bool(regex.search(x))
     else:
-        f = lambda x: pat in x
+        if case:
+            f = lambda x: pat in x
+        else:
+            upper_pat = pat.upper()
+            f = lambda x: upper_pat in x
+            return _na_map(f, str_upper(arr), na, dtype=bool)
     return _na_map(f, arr, na, dtype=bool)
 
 

pandas/tests/test_strings.py

@@ -189,6 +189,17 @@ def test_contains(self):
         self.assertEqual(result.dtype, np.bool_)
         tm.assert_almost_equal(result, expected)
 
+        # case insensitive using regex
+        values = ['Foo', 'xYz', 'fOOomMm__fOo', 'MMM_']
+        result = strings.str_contains(values, 'FOO|mmm', case=False)
+        expected = [True, False, True, True]
+        tm.assert_almost_equal(result, expected)
+
+        # case insensitive without regex
+        result = strings.str_contains(values, 'foo', regex=False, case=False)
+        expected = [True, False, True, False]
+        tm.assert_almost_equal(result, expected)
+
         # mixed
         mixed = ['a', NA, 'b', True, datetime.today(), 'foo', None, 1, 2.]
         rs = strings.str_contains(mixed, 'o')