cleanup of previous patch

crysp/bits.py

@@ -94,9 +94,6 @@ def __init__(self,v,size=None,bitorder=-1):
         self.ival = (self.ival<<1)|(x&1)
     elif isinstance(v,bytes):
       self.load(v,bitorder)
-    elif isinstance(v,str):
-      # We are using python3, because 'str' and 'bytes' are different
-      self.load(v.encode(),bitorder)
     else:
         raise TypeError(v)
     if size!=None: self.size = size

crysp/crc.py

@@ -45,8 +45,7 @@ def crc(data,table,Xinit=0,Xfinal=None):
     print("crc: bytes input required")
     return None
   r = Bits(Xinit,table[0].size)
-  data = struct.unpack("%dB"%len(data), data)
-  for b in data:
+  for b in struct.unpack("%dB"%len(data), data):
     p = table[(r.ival^b)&0xff]
     r = (r>>8)^p
   if Xfinal:

tests/test_chacha.py

@@ -87,8 +87,7 @@ def test_chacha_002():
 # -------------------------------------------------------------------
 
 def tobits(s):
-    s = s.split()
-    x = struct.pack("%dB"%len(s), *[int(x,16) for x in s])
+    x = struct.pack("%dB"%len(s), *[int(x,16) for x in s.split()])
     return Bits(x,bitorder=1)
 
 def test_chacha_003():