Fix import * and a bunch of PEP8 formatting

1 files changed, 5 insertions, 6 deletions

diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py
index 6ab298ac..c26966e8 100644
--- a/paramiko/dsskey.py
+++ b/paramiko/dsskey.py
@@ -23,8 +23,9 @@ DSS keys.
 from Crypto.PublicKey import DSA
 from Crypto.Hash import SHA
 
-from paramiko.common import *
 from paramiko import util
+from paramiko.common import zero_byte, rng
+from paramiko.py3compat import long
 from paramiko.ssh_exception import SSHException
 from paramiko.message import Message
 from paramiko.ber import BER, BERException
@@ -110,9 +111,9 @@ class DSSKey (PKey):
         rstr = util.deflate_long(r, 0)
         sstr = util.deflate_long(s, 0)
         if len(rstr) < 20:
-            rstr = zero_byte * (20 - len(rstr)) + rstr
+            rstr += zero_byte * (20 - len(rstr))
         if len(sstr) < 20:
-            sstr = zero_byte * (20 - len(sstr)) + sstr
+            sstr += zero_byte * (20 - len(sstr))
         m.add_string(rstr + sstr)
         return m
 
@@ -137,7 +138,7 @@ class DSSKey (PKey):
     def _encode_key(self):
         if self.x is None:
             raise SSHException('Not enough key information')
-        keylist = [ 0, self.p, self.q, self.g, self.y, self.x ]
+        keylist = [0, self.p, self.q, self.g, self.y, self.x]
         try:
             b = BER()
             b.encode(keylist)
@@ -168,10 +169,8 @@ class DSSKey (PKey):
         return key
     generate = staticmethod(generate)
 
-
     ###  internals...
 
-
     def _from_private_key_file(self, filename, password):
         data = self._read_private_key_file('DSA', filename, password)
         self._decode_key(data)