Adapt for 1.8.1 (try bs4, fallback to BeautifulSoup)

This commit is contained in:
Daniel Berteaud 2020-02-24 18:06:10 +01:00
parent 5dadd1045b
commit 454824f864
2 changed files with 19 additions and 6 deletions

View File

@ -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
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

View File

@ -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