From c6870777e7c16c0d7f3c5b69c18b22f1cf76738f Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Mon, 22 Jan 2018 16:20:54 +0200 Subject: [PATCH 1/2] fix sending plugin votes --- python/pyplugin_installer/installer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/pyplugin_installer/installer.py b/python/pyplugin_installer/installer.py index 48236e9acc33..0efbf965c737 100644 --- a/python/pyplugin_installer/installer.py +++ b/python/pyplugin_installer/installer.py @@ -22,9 +22,9 @@ * * ***************************************************************************/ """ -from builtins import str import os +import json import zipfile from qgis.PyQt.QtCore import Qt, QObject, QDir, QUrl, QFileInfo, QFile @@ -525,10 +525,10 @@ def sendVote(self, plugin_id, vote): if not plugin_id or not vote: return False url = "http://plugins.qgis.org/plugins/RPC2/" - params = "{\"id\":\"djangorpc\",\"method\":\"plugin.vote\",\"params\":[%s,%s]}" % (str(plugin_id), str(vote)) + params = {"id":"djangorpc", "method":"plugin.vote", "params":[str(plugin_id), str(vote)]} req = QNetworkRequest(QUrl(url)) - req.setRawHeader("Content-Type", "application/json") - QgsNetworkAccessManager.instance().post(req, params) + req.setRawHeader(b"Content-Type", b"application/json") + QgsNetworkAccessManager.instance().post(req, bytes(json.dumps(params), "utf-8")) return True def installFromZipFile(self, filePath): From 08255f7ba0dce3b997417dc34eae80572a49ee52 Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Mon, 22 Jan 2018 18:50:43 +0200 Subject: [PATCH 2/2] fix indentation --- python/pyplugin_installer/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyplugin_installer/installer.py b/python/pyplugin_installer/installer.py index 0efbf965c737..541eb31ae673 100644 --- a/python/pyplugin_installer/installer.py +++ b/python/pyplugin_installer/installer.py @@ -525,7 +525,7 @@ def sendVote(self, plugin_id, vote): if not plugin_id or not vote: return False url = "http://plugins.qgis.org/plugins/RPC2/" - params = {"id":"djangorpc", "method":"plugin.vote", "params":[str(plugin_id), str(vote)]} + params = {"id": "djangorpc", "method": "plugin.vote", "params": [str(plugin_id), str(vote)]} req = QNetworkRequest(QUrl(url)) req.setRawHeader(b"Content-Type", b"application/json") QgsNetworkAccessManager.instance().post(req, bytes(json.dumps(params), "utf-8"))