mirror of
https://github.com/servo/servo.git
synced 2025-07-04 22:13:40 +01:00
Move delete function to util.py
This makes it easier to reuse in other places.
This commit is contained in:
parent
7413c716fb
commit
b1824f7a05
2 changed files with 14 additions and 12 deletions
|
@ -10,16 +10,24 @@
|
|||
from __future__ import absolute_import, print_function, unicode_literals
|
||||
|
||||
import os
|
||||
import os.path as path
|
||||
import os.path
|
||||
import platform
|
||||
import sys
|
||||
import shutil
|
||||
from socket import error as socket_error
|
||||
import StringIO
|
||||
import sys
|
||||
import tarfile
|
||||
import zipfile
|
||||
import urllib2
|
||||
|
||||
|
||||
def delete(path):
|
||||
if os.path.isdir(path) and not os.path.islink(path):
|
||||
shutil.rmtree(path)
|
||||
else:
|
||||
os.remove(path)
|
||||
|
||||
|
||||
def host_platform():
|
||||
os_type = platform.system().lower()
|
||||
if os_type == "linux":
|
||||
|
@ -126,7 +134,7 @@ def download_bytes(desc, src):
|
|||
def download_file(desc, src, dst):
|
||||
tmp_path = dst + ".part"
|
||||
try:
|
||||
start_byte = path.getsize(tmp_path)
|
||||
start_byte = os.path.getsize(tmp_path)
|
||||
with open(tmp_path, 'ab') as fd:
|
||||
download(desc, src, fd, start_byte=start_byte)
|
||||
except os.error:
|
||||
|
@ -143,8 +151,8 @@ def extract(src, dst, movedir=None):
|
|||
|
||||
if movedir:
|
||||
for f in os.listdir(movedir):
|
||||
frm = path.join(movedir, f)
|
||||
to = path.join(dst, f)
|
||||
frm = os.path.join(movedir, f)
|
||||
to = os.path.join(dst, f)
|
||||
os.rename(frm, to)
|
||||
os.rmdir(movedir)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue