Simplify short-circuit conditionals.

tupton · Jul 3, 2015 · 6315ed3 · 6315ed3
1 parent 1ca30e4
commit 6315ed3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/compact_path.py b/compact_path.py
@@ -22,10 +22,7 @@
 from docopt import docopt
 
 def compact_path(path, trigger=0):
-    if not path or len(path) == 0:
-        return
-
-    if len(path) <= trigger or path == os.sep:
+    if not path or len(path) == 0 or len(path) <= trigger or path == os.sep:
         return path
 
     parts = path.split(os.sep)

diff --git a/test_compact_path.py b/test_compact_path.py
@@ -3,7 +3,7 @@
 import nose.tools as tools
 
 def test_empty():
-    tools.eq_(None, compact_path(''))
+    tools.eq_('', compact_path(''))
 
     tools.eq_(None, compact_path(None))