aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Naselli <anaselli@linux.it>2020-03-28 15:40:49 +0100
committerAngelo Naselli <anaselli@linux.it>2020-03-28 15:40:49 +0100
commitd50eb092a79ded823d0a9b8b8fb18af92c554c36 (patch)
tree922edddf25abb6402449ec22f03832d40a91fef8
parent28e91224eb01ea21b44cd00a16c3018bcb463df7 (diff)
downloadmanatools-d50eb092a79ded823d0a9b8b8fb18af92c554c36.tar
manatools-d50eb092a79ded823d0a9b8b8fb18af92c554c36.tar.gz
manatools-d50eb092a79ded823d0a9b8b8fb18af92c554c36.tar.bz2
manatools-d50eb092a79ded823d0a9b8b8fb18af92c554c36.tar.xz
manatools-d50eb092a79ded823d0a9b8b8fb18af92c554c36.zip
Fixed contribfinder for python3
-rw-r--r--Changes2
-rw-r--r--lib/ManaTools/Version.pm4
-rwxr-xr-xmodules/contribfinder.py9
3 files changed, 9 insertions, 6 deletions
diff --git a/Changes b/Changes
index 2fb1372c..77a25ca8 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+1.2.1 Sat 28 Mar 2020
+ - Fixed contribfinder to work with python 3
1.2.0
- fixed a crash on rpmdragora for gpg keys group
- fixed mana --help (utf8) (thanks to Masanori Kakura)
diff --git a/lib/ManaTools/Version.pm b/lib/ManaTools/Version.pm
index 2a2b2223..0d96c628 100644
--- a/lib/ManaTools/Version.pm
+++ b/lib/ManaTools/Version.pm
@@ -58,12 +58,12 @@ use Moose::Role;
=head1 VERSION
- Version 1.2.0
+ Version 1.2.1
See Changes for details
=cut
-our $VERSION = '1.2.0';
+our $VERSION = '1.2.1';
has 'Version' => (
is => 'ro',
diff --git a/modules/contribfinder.py b/modules/contribfinder.py
index bfe06b3c..3eb82317 100755
--- a/modules/contribfinder.py
+++ b/modules/contribfinder.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# vim: set et ts=4 sw=4:
#coding:utf-8
#############################################################################
@@ -79,7 +79,8 @@ class mainGui():
resp, content = h.request(dlurl, 'GET')
if resp.status != 200:
raise Exception('Package cannot be found in maintdb')
- retoutput = content.rstrip('\n')
+ str_content = content.decode('utf-8')
+ retoutput = str_content.rstrip('\n')
except:
retoutput = "No contributors found"
return retoutput
@@ -97,7 +98,7 @@ class mainGui():
self.dialog.destroy()
break
if event.widget() == self.btnLookAtIt:
- if(cmp(self.contributor.strip(),"")!=0):
+ if(self.contributor.strip()):
url = 'http://people.mageia.org/u/%s.html' % self.contributor
os.system("www-browser %s" % url)
if event.widget() == self.btnsearch:
@@ -105,7 +106,7 @@ class mainGui():
#self.rtinformations.setValue("Loading...")
#self.dialog.doneMultipleChanges()
self.contributor = self.stripErrMessages(self.queryMaintDB(self.txtpkgname.value()))
- if(cmp(self.contributor.strip(),"")!=0):
+ if(self.contributor.strip()):
outstr = 'Maintainer:&nbsp;<a href="http://people.mageia.org/u/%s.html">%s</a><br />e-mail:&nbsp;<a href="mailto:%s@mageia.org">%s@mageia.org</a>' % (self.contributor,self.contributor,self.contributor,self.contributor)
else:
outstr = ''