Merge branch 'master' of https://github.com/NVIDIA/DIGITS

NVIDIA · Mar 23, 2015 · 0c1ec6d · 0c1ec6d
2 parents 3a69ea9 + c85b50d
commit 0c1ec6d
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/digits-devserver b/digits-devserver
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
 
 import sys

diff --git a/digits-walkthrough b/digits-walkthrough
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
 
 import os

diff --git a/digits/config.py b/digits/config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
 
 import os

diff --git a/digits/utils/__init__.py b/digits/utils/__init__.py
@@ -96,6 +96,13 @@ def sizeof_fmt(size, suffix='B'):
     Arguments:
     size -- size in bytes
     """
+    try:
+        size = int(size)
+    except ValueError:
+        return None
+    if size <= 0:
+        return '0 %s' % suffix
+
     size_name = ('', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y')
     i = int(math.floor(math.log(size,1024)))
     if i >= len(size_name):

diff --git a/tools/create_db.py b/tools/create_db.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
 
 import sys

diff --git a/tools/parse_folder.py b/tools/parse_folder.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
 
 import sys

diff --git a/tools/resize_image.py b/tools/resize_image.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
 
 import sys