Skip to content

Commit 28d99cc

Browse files
Fix disk_usage on Python2, I want to deprecate Python2 already :(
1 parent 3211b21 commit 28d99cc

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

css-html-js-minify.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
from doctest import testmod
2323
from hashlib import sha1
2424
from multiprocessing import cpu_count, Pool
25-
from shutil import disk_usage
2625
from tempfile import gettempdir
2726
from time import sleep
2827

2928
try:
3029
from urllib import request
3130
from subprocess import getoutput
31+
from shutil import disk_usage
3232
from io import StringIO # pure-Python StringIO supports unicode.
3333
except ImportError:
34-
request = getoutput = None
34+
request = getoutput = disk_usage = None
3535
from StringIO import StringIO # lint:ok
3636
try:
3737
import resource # windows dont have resource
@@ -1074,11 +1074,12 @@ def check_working_folder(folder_to_check):
10741074
# What if destination folder is not Writable by the user.
10751075
elif not os.access(folder_to_check, os.W_OK):
10761076
log.critical("Folder {} Not Writable !.".format(folder_to_check))
1077-
hdd = int(disk_usage(folder_to_check).free / 1024 / 1024 / 1024)
1078-
if hdd: # > 1 Gb
1079-
log.info("Total Free Space: ~{} GigaBytes.".format(hdd))
1080-
else: # < 1 Gb
1081-
log.critical("Total Free Space is < 1 GigaByte; Epic Fail !.")
1077+
if disk_usage:
1078+
hdd = int(disk_usage(folder_to_check).free / 1024 / 1024 / 1024)
1079+
if hdd: # > 1 Gb
1080+
log.info("Total Free Space: ~{} GigaBytes.".format(hdd))
1081+
else: # < 1 Gb
1082+
log.critical("Total Free Space is < 1 GigaByte; Epic Fail !.")
10821083

10831084

10841085
def make_arguments_parser():

0 commit comments

Comments
 (0)