improved is_pangram and is_palindrome

daveoncode · daveoncode · commit aa91df6d61a0 · 2016-11-03T15:01:17.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Python String Utils Changelog
 
+## v0.4.1
+
+### Changed:
+- is_palindrome and is_pangram now return False if the given object is not a string instead of raising an exception
+
+
 ## v0.4.0
 
 ### Added:
diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree
diff --git a/docs/_build/html/.buildinfo b/docs/_build/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 76a6be5326d21a1075be87b1431e2261
+config: 570d49f719075ab443795a1c37a0913b
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html
@@ -9,7 +9,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Index &mdash; Python String Utils 0.4.0 documentation</title>
+  <title>Index &mdash; Python String Utils 0.4.1 documentation</title>
   
 
   
@@ -34,7 +34,7 @@
         <link rel="index" title="Index"
               href="#"/>
         <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="Python String Utils 0.4.0 documentation" href="index.html"/> 
+    <link rel="top" title="Python String Utils 0.4.1 documentation" href="index.html"/> 
 
   
   <script src="_static/js/modernizr.min.js"></script>
@@ -62,7 +62,7 @@
             
             
               <div class="version">
-                0.4.0
+                0.4.1
               </div>
             
           
@@ -303,7 +303,7 @@ <h2 id="W">W</h2>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'0.4.0',
+            VERSION:'0.4.1',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Welcome to Python String Utils’s documentation! &mdash; Python String Utils 0.4.0 documentation</title>
+  <title>Welcome to Python String Utils’s documentation! &mdash; Python String Utils 0.4.1 documentation</title>
   
 
   
@@ -33,7 +33,7 @@
         <link rel="index" title="Index"
               href="genindex.html"/>
         <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="Python String Utils 0.4.0 documentation" href="#"/> 
+    <link rel="top" title="Python String Utils 0.4.1 documentation" href="#"/> 
 
   
   <script src="_static/js/modernizr.min.js"></script>
@@ -61,7 +61,7 @@
             
             
               <div class="version">
-                0.4.0
+                0.4.1
               </div>
             
           
@@ -628,7 +628,7 @@ <h1>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Pe
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'0.4.0',
+            VERSION:'0.4.1',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv
@@ -1,5 +1,5 @@
 # Sphinx inventory version 2
 # Project: Python String Utils
-# Version: 0.4.0
+# Version: 0.4.1
 # The remainder of this file is compressed using zlib.
 xڝ��N!���M<�ƽ�x0�dc<:3(_�E����;FcRo�����d�$3�".t� ��>v39{�l���;��w�r`�$�^�B=b�~ ��o�IO�x�����K`&�@*`�<�2�M��_��XDT�(Rp������A�����m�crb�:g�yИ�ȌI��uw��8Z�U�:Nk�s貉�Yb�=$]�(dOS��"�����r�~/��U'�벻�t�h�x;�� ��%Щu�c��EA����,���O�5.��ю}h_\����0'���O�Tt��M݊
diff --git a/docs/_build/html/py-modindex.html b/docs/_build/html/py-modindex.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Python Module Index &mdash; Python String Utils 0.4.0 documentation</title>
+  <title>Python Module Index &mdash; Python String Utils 0.4.1 documentation</title>
   
 
   
@@ -33,7 +33,7 @@
         <link rel="index" title="Index"
               href="genindex.html"/>
         <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="Python String Utils 0.4.0 documentation" href="index.html"/>
+    <link rel="top" title="Python String Utils 0.4.1 documentation" href="index.html"/>
  
 
     <script type="text/javascript">
@@ -68,7 +68,7 @@
             
             
               <div class="version">
-                0.4.0
+                0.4.1
               </div>
             
           
@@ -181,7 +181,7 @@ <h1>Python Module Index</h1>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'0.4.0',
+            VERSION:'0.4.1',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html
@@ -8,7 +8,7 @@
   
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Search &mdash; Python String Utils 0.4.0 documentation</title>
+  <title>Search &mdash; Python String Utils 0.4.1 documentation</title>
   
 
   
@@ -33,7 +33,7 @@
         <link rel="index" title="Index"
               href="genindex.html"/>
         <link rel="search" title="Search" href="#"/>
-    <link rel="top" title="Python String Utils 0.4.0 documentation" href="index.html"/> 
+    <link rel="top" title="Python String Utils 0.4.1 documentation" href="index.html"/> 
 
   
   <script src="_static/js/modernizr.min.js"></script>
@@ -61,7 +61,7 @@
             
             
               <div class="version">
-                0.4.0
+                0.4.1
               </div>
             
           
@@ -167,7 +167,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'0.4.0',
+            VERSION:'0.4.1',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/conf.py b/docs/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.0'
+version = '0.4.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.0'
+release = '0.4.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='python-string-utils',
-    version='0.4.0',
+    version='0.4.1',
     description='Utility functions for strings checking and manipulation.',
     long_description=long_description,
     author='Davide Zanotti',
diff --git a/string_utils.py b/string_utils.py
@@ -353,6 +353,8 @@ def is_palindrome(string, strict=True):
     :return: True if the string is a palindrome (like "otto", or "i topi non avevano nipoti" if strict=False),
     False otherwise
     """
+    if not is_string(string):
+        return False
     if strict:
         return reverse(string) == string
     return is_palindrome(SPACES_RE.sub('', string))
@@ -365,7 +367,10 @@ def is_pangram(string):
     :param string: String to check.
     :return: True if the string is a pangram, False otherwise.
     """
-    return set(SPACES_RE.sub('', string)).issuperset(letters_set)
+    try:
+        return set(SPACES_RE.sub('', string)).issuperset(letters_set)
+    except TypeError:
+        return False
 
 
 def words_count(string):
diff --git a/tests.py b/tests.py
@@ -1204,6 +1204,14 @@ def test_should_work_as_expected_for_multiple_lines_string(self):
 
 class IsPalindromeTestCase(TestCase):
 
+    def test_non_string_objects_return_false(self):
+        self.assertFalse(is_palindrome(1))
+        self.assertFalse(is_palindrome(['xx']))
+        self.assertFalse(is_palindrome({}))
+        self.assertFalse(is_palindrome(False))
+        self.assertFalse(is_palindrome((1, 2, 3)))
+        self.assertFalse(is_palindrome(object()))
+
     def test_strict_checking(self):
         self.assertFalse(is_palindrome('nope!'))
         self.assertFalse(is_palindrome('i topi non avevano nipoti'))
@@ -1216,6 +1224,14 @@ def test_no_strict_mode(self):
 
 
 class IsPangramTestCase(TestCase):
+    def test_non_string_objects_return_false(self):
+        self.assertFalse(is_pangram(1))
+        self.assertFalse(is_pangram(['xx']))
+        self.assertFalse(is_pangram({}))
+        self.assertFalse(is_pangram(False))
+        self.assertFalse(is_pangram((1, 2, 3)))
+        self.assertFalse(is_pangram(object()))
+
     def test_is_pangram_returns_expected_bool(self):
         self.assertFalse(is_pangram('hello world'))
         self.assertTrue(is_pangram('The quick brown fox jumps over the lazy dog'))
