From a57b7ffa900b4b107ee0a9c02451890df936bd02 Mon Sep 17 00:00:00 2001 From: sigoa Date: Mon, 4 Dec 2017 06:16:06 +0100 Subject: [PATCH] code audit showed wrong # of params;2 params is OK the calls are done with 2 params , so we need a dummy to satisfy automatic code audit Change-Id: I29e31e6e0d3a65745f37dde9988073597a900aba Signed-off-by: sigoa --- src/bitmessageqt/__init__.py | 4 ++++ src/pyelliptic/arithmetic.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index b1b1c339..a25a95a4 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -3874,7 +3874,11 @@ class MyForm(settingsmixin.SMainWindow): else: data = self.getCurrentMessageId() if data != False: +<<<<<<< v0.6 message = "Error occurred: could not load message from disk. THIS IS NOT A BM but an error message." ## vvvv translate ! _translate +======= + message = "Error occurred: could not load message from disk." #### TODO: _translate( this ! happens frequently +>>>>>>> bde2d1a translate: could not load message from disk messageTextedit.setCurrentFont(QtGui.QFont()) messageTextedit.setTextColor(QtGui.QColor()) messageTextedit.setContent(message) diff --git a/src/pyelliptic/arithmetic.py b/src/pyelliptic/arithmetic.py index 1eec381a..4f566574 100644 --- a/src/pyelliptic/arithmetic.py +++ b/src/pyelliptic/arithmetic.py @@ -57,7 +57,7 @@ def base10_add(a,b): y = (m*(a[0]-x)-a[1]) % P return (x,y) -def base10_double(a): +def base10_double(a, var_unused): if a == None: return None m = ((3*a[0]*a[0]+A)*inv(2*a[1],P)) % P x = (m*m-2*a[0]) % P