Fix a few code format issues

Author: hardbyte

examples/alternative_base.py

@@ -13,7 +13,7 @@ class ExampleEncodedNumber(paillier.EncodedNumber):
 
 
 def encode_and_encrypt_example():
-    print("Encoding a large positive number. With a BASE 64 encoding scheme")
+    print("Encoding a large positive number. With a BASE {} encoding scheme".format(ExampleEncodedNumber.BASE))
     encoded = ExampleEncodedNumber.encode(public_key, 2.1 ** 20)
     print("Checking that decoding gives the same number...")
     assert 2.1 ** 20 == encoded.decode()
@@ -30,14 +30,14 @@ def encode_and_encrypt_example():
 
 
 def math_example():
-    print("Encoding two large positive numbers. With a BASE 64 encoding "
-          "scheme")
+    print("Encoding two large positive numbers. BASE={}".format(ExampleEncodedNumber.BASE))
 
     a = 102545 + (64 ** 8)
     b = 123 + (8 ** 20)
 
     encoded_a = ExampleEncodedNumber.encode(public_key, a)
     encoded_b = ExampleEncodedNumber.encode(public_key, b)
+
     print("Checking that decoding gives the same number...")
     assert a == encoded_a.decode()
     assert b == encoded_b.decode()

phe/paillier.py

@@ -213,7 +213,8 @@ class PaillierPrivateKey(object):
     def __init__(self, public_key, p, q):
         if not p*q == public_key.n:
             raise ValueError('given public key does not match the given p and q.')
-        if p == q: #check that p and q are different, otherwise we can't compute p^-1 mod q
+        if p == q:
+            # check that p and q are different, otherwise we can't compute p^-1 mod q
             raise ValueError('p and q have to be different')
         self.public_key = public_key
         if q < p: #ensure that p < q. 
@@ -226,8 +227,8 @@ def __init__(self, public_key, p, q):
 
         self.qsquare = self.q * self.q
         self.p_inverse = invert(self.p, self.q)
-        self.hp = self.h_function(self.p, self.psquare);
-        self.hq = self.h_function(self.q, self.qsquare);
+        self.hp = self.h_function(self.p, self.psquare)
+        self.hq = self.h_function(self.q, self.qsquare)
 
     @staticmethod
     def from_totient(public_key, totient):
@@ -347,8 +348,7 @@ def h_function(self, x, xsquare):
         'Decryption using Chinese-remaindering'.
         """
         return invert(self.l_function(powmod(self.public_key.g, x - 1, xsquare),x), x)
-            
-    
+
     def l_function(self, x, p):
         """Computes the L function as defined in Paillier's paper. That is: L(x,p) = (x-1)/p"""
         return (x - 1) // p
@@ -364,11 +364,12 @@ def crt(self, mp, mq):
         return mp + (u * self.p)
 
     def __eq__(self, other):
-        return (self.p == other.p and self.q == other.q)
+        return self.p == other.p and self.q == other.q
 
     def __hash__(self):
         return hash((self.p, self.q))
 
+
 class PaillierPrivateKeyring(Mapping):
     """Holds several private keys and can decrypt using any of them.