Consistent use of spaces + Python 2 & 3 support

FGRibreau · Sep 28, 2015 · 31e6639 · 31e6639
1 parent 9635b6e
commit 31e6639
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/platform/python/MailChecker.py b/platform/python/MailChecker.py
@@ -17,7 +17,7 @@ def is_valid(self, email):
         return self.is_valid_email_format(email) and self.fake_matcher.search(email) == None
 
     def is_valid_email_format(self, email):
-        if email:
+        if email and email != '':
             return self.valid_matcher.search(email) != None
         else:
-			return False
+            return False
diff --git a/platform/python/MailChecker.tmpl.py b/platform/python/MailChecker.tmpl.py
@@ -17,7 +17,7 @@ def is_valid(self, email):
         return self.is_valid_email_format(email) and self.fake_matcher.search(email) == None
 
     def is_valid_email_format(self, email):
-        if email:
+        if email and email != '':
             return self.valid_matcher.search(email) != None
         else:
-			return False
+            return False
diff --git a/test/platform.python.test.py b/test/platform.python.test.py
@@ -1,3 +1,6 @@
+# compatibility with both Python 2.x and 3.x
+from __future__ import print_function
+
 # for testing only; add the python MailChecker to the system path
 import os, sys
 sys.path.insert(0, '../platform/python/')
@@ -7,9 +10,9 @@
 
 m = MailChecker.MailChecker()
 
-print m.is_valid('bla@example.com')
-print m.is_valid('bla@yourlms.biz')
-print m.is_valid('example@you.it')
-print m.is_valid('bla@hotmail.com')
-print m.is_valid('bla@yui.it')
-print m.is_valid('')
+print( m.is_valid('bla@example.com'))
+print( m.is_valid('bla@yourlms.biz'))
+print( m.is_valid('example@you.it'))
+print( m.is_valid('bla@hotmail.com'))
+print( m.is_valid('bla@yui.it'))
+print( m.is_valid(''))