From 454824f86430132f230c9742a3b7fa271bfd1e82 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 24 Feb 2020 18:06:10 +0100 Subject: [PATCH] Adapt for 1.8.1 (try bs4, fallback to BeautifulSoup) --- WAPT/control | 19 ++++++++++++++----- setup.py | 6 +++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/WAPT/control b/WAPT/control index 6845173..afb6e52 100644 --- a/WAPT/control +++ b/WAPT/control @@ -1,8 +1,10 @@ package : fws-ccleaner -version : 5.63.0.7540-2 +version : 5.63.0.7540-3 architecture : all section : base priority : optional +name : +categories : maintainer : Daniel Berteaud description : Clean and optimize Windows depends : @@ -20,14 +22,21 @@ description_fr : Outils de nettoyage et d'optimisation de Windows description_pl : description_de : description_es : +description_pt : +description_it : +description_nl : +description_ru : audit_schedule : editor : Piriform keywords : licence : homepage : http://www.piriform.com/ccleaner/ -package_uuid : f6d9f756-5d71-41bb-a516-aefb069bde38 +package_uuid : 7c033959-2059-4132-94f9-a27e81d762b9 +valid_from : +valid_until : +forced_install_on : signer : Daniel Berteaud signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a -signature : slHNP784ADGXt2wavDdPtV30ZLVINxR4+tSV4wk8EjSudxwEu7qN0XoA9isN4Vzk9PfcpZnJOXoXTWAN/DkjzikNyP+DBZBZHHk0qAxqNYSUzkCc3Qzch+43rIuj4RsV10xuo8bQjBV7WaSULqI2psiLQ6zmnJlXO9ltJC4Bfmvv5Rp1AbPay29GGdcFBwGITbJD/+Sx50KqvkeCi+22qGMtFjNJrudFTk9smTkMUAtqVHyiRM9VermVCiM8xW37JI4Qo3oStnHwt7xEgVPbSYCl8Mdi46mHlxP2KR+E7xXbsKzYMAewFiaJyzNHdCzBC+QpzH/oNUGQn3KkjxZ0YQ== -signature_date : 2019-07-23T13:17:57.812000 -signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_os_version,max_os_version,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,signer,signer_fingerprint,signature_date,signed_attributes \ No newline at end of file +signature : KUpjzrt+IGv5+Tca1Jea/EsQmMpK/loB6NCwSJDP9SPP7zRrg1uQB5eV9nuedNmkMi7AXhzlzHFO9RK3oGbJ6DR8PPQQK/Eoq11wqNO4J+LgF5IiLRd4/6UC9E0vkLw5wwxfrlIVGi0wj5r3twnS8vcqVseipUSV8NkZDgths0dxyDTT9HfkjD42qm6djmyN86ZOEmHLRyjMieclFtd/ukWO/HiVkTwRc//5l/hTPC602+7FrLbd188xJ0wD0lLCfdHtEHnS/2D9f5IV/uGpkRO4xW1c4up4GFzQL13CctpXMiLa4VpGgQFmgBbU6KFdXicp94cMWmQeAWm0Ocn1Aw== +signature_date : 2020-02-24T18:04:49.297000 +signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_os_version,max_os_version,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,description_pt,description_it,description_nl,description_ru,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,signer,signer_fingerprint,signature_date,signed_attributes \ No newline at end of file diff --git a/setup.py b/setup.py index e9fc799..f8a0000 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,6 @@ # # ----------------------------------------------------------------------- from setuphelpers import * -import requests,BeautifulSoup uninstallkey = [] @@ -51,6 +50,11 @@ def session_setup(): registry_set(HKEY_CURRENT_USER,'software\\Piriform\\CCleaner', 'CheckTrialOffer','0') def update_package(): + import requests + try: + import bs4 as BeautifulSoup + except: + import BeautifulSoup control = PackageEntry().load_control_from_wapt ('.') page = requests.get('https://www.ccleaner.com/fr-fr/ccleaner/download/slim',headers={'User-Agent':'Mozilla/5.0 (Windows NT 6.1; Win64; x64)'}).text