From 24e34b35a00a784e7720c37f4459fc01577c76f4 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Thu, 15 Jun 2017 11:19:32 +0200 Subject: [PATCH] Spare fixes --- CHANGELOG.md | 4 ---- requirements/install.txt | 2 +- requirements/test.txt | 2 +- src/pyload/core/iface.py | 4 ++-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 892057e13a..5f695b1673 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,6 @@ Release History --------------- -### 0.5.x (unreleased) - -- Development release - ### 0.4.9 (2011-12-14) - Fixed various encoding issues diff --git a/requirements/install.txt b/requirements/install.txt index 73b79e2bac..2f1e958d4f 100644 --- a/requirements/install.txt +++ b/requirements/install.txt @@ -8,4 +8,4 @@ pyload.config~=0.6 pyload.requests~=0.6 pyload.utils2~=0.6 semver -setuptools +setuptools>=0.6.39 diff --git a/requirements/test.txt b/requirements/test.txt index 94024a3433..3984446b4a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,6 +6,6 @@ pyload.config~=0.6 pyload.requests~=0.6 pyload.utils2~=0.6 requests>=1.2.2 -setuptools +setuptools>=0.6.39 unittest2 websocket-client>=0.8 diff --git a/src/pyload/core/iface.py b/src/pyload/core/iface.py index 4313c2a2b1..2b8f5d941b 100644 --- a/src/pyload/core/iface.py +++ b/src/pyload/core/iface.py @@ -12,7 +12,7 @@ import autoupgrade import daemonize -from pyload.utils.fs import cleanpy, makedirs +from pyload.utils.fs import makedirs, remove from .__about__ import __namespace__, __package_name__, __version__ from .init import Core, _pmap @@ -95,7 +95,7 @@ def cleanup(): if _pmap: raise RuntimeError packdir = os.path.join(get_default_cache(), __package_name__) - cleanpy(packdir) + remove(packdir, ignore_errors=True) # def test():