black + remove unused imports

This commit is contained in:
Peter Justin 2019-04-08 10:03:24 +02:00
parent 93de151025
commit d8fe34e5bc
6 changed files with 179 additions and 117 deletions

View file

@ -25,9 +25,10 @@ __date__ = "$Date: 2011/12/28 $"
__revision__ = "$Date: 2017/03/10 $"
__license__ = "GPLv3"
import math
import itertools
from typing import Iterator, List, Dict
import math
from typing import Dict, Iterator, List
def identity() -> Iterator[int]:
"""f(x) = x
@ -37,15 +38,17 @@ def identity() -> Iterator[int]:
yield n
n += 1
def triangular_numbers() -> Iterator[int]:
"""Triangular numbers: a(n) = C(n+1,2) = n(n+1)/2 = 0+1+2+...+n.
http://oeis.org/A000217
"""
n = 0
while True:
yield (n*(n+1))//2
yield (n * (n + 1)) // 2
n += 1
def fermat() -> Iterator[int]:
"""Generate the n-th Fermat Number.
https://oeis.org/A000215
@ -53,7 +56,8 @@ def fermat() -> Iterator[int]:
y = 3
while True:
yield y
y = pow(y-1,2)+1
y = pow(y - 1, 2) + 1
def mersenne() -> Iterator[int]:
"""Generate 2^p - 1, where p is prime.
@ -61,13 +65,14 @@ def mersenne() -> Iterator[int]:
"""
prime_numbers = eratosthenes()
while True:
yield 2**next(prime_numbers) - 1
yield 2 ** next(prime_numbers) - 1
def eratosthenes() -> Iterator[int]:
"""Generate the prime numbers with the sieve of Eratosthenes.
https://oeis.org/A000040
"""
d = {} # type: Dict[int, List[int]]
d = {} # type: Dict[int, List[int]]
for i in itertools.count(2):
if i in d:
for j in d[i]:
@ -77,6 +82,7 @@ def eratosthenes() -> Iterator[int]:
d[i * i] = [i]
yield i
def composite() -> Iterator[int]:
"""Generate the composite numbers using the sieve of Eratosthenes.
https://oeis.org/A002808
@ -87,6 +93,7 @@ def composite() -> Iterator[int]:
yield n
p1 = p2
def carmichael() -> Iterator[int]:
"""Composite numbers n such that a^(n-1) == 1 (mod n) for every a coprime
to n.
@ -94,11 +101,12 @@ def carmichael() -> Iterator[int]:
"""
for m in composite():
for a in range(2, m):
if pow(a,m,m) != a:
if pow(a, m, m) != a:
break
else:
yield m
def ackermann_naive(m: int, n: int) -> int:
"""Ackermann number.
"""
@ -109,6 +117,7 @@ def ackermann_naive(m: int, n: int) -> int:
else:
return ackermann(m - 1, ackermann(m, n - 1))
def ackermann(m: int, n: int) -> int:
"""Ackermann number.
"""
@ -127,6 +136,7 @@ def ackermann(m: int, n: int) -> int:
else:
return n + 1
def fibonacci() -> Iterator[int]:
"""Generate the sequence of Fibonacci.
https://oeis.org/A000045
@ -136,6 +146,7 @@ def fibonacci() -> Iterator[int]:
yield a
a, b = b, a + b
def log_gen() -> Iterator[int]:
"""Logarithmic generator.
"""

View file

@ -1,5 +1,5 @@
#!/usr/bin/env python
#-*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# Stéganô - Stéganô is a basic Python Steganography module.
# Copyright (C) 2010-2019 Cédric Bonhomme - https://www.cedricbonhomme.org
@ -25,20 +25,21 @@ __date__ = "$Date: 2016/03/13 $"
__revision__ = "$Date: 2018/12/18 $"
__license__ = "GPLv3"
import sys
from typing import IO, Iterator, Union
from PIL import Image
from typing import Union, Iterator, IO
from stegano import tools
from . import generators
def hide(input_image: Union[str, IO[bytes]],
message: str,
generator: Iterator[int],
shift: int = 0,
encoding: str = 'UTF-8',
auto_convert_rgb: bool = False):
def hide(
input_image: Union[str, IO[bytes]],
message: str,
generator: Iterator[int],
shift: int = 0,
encoding: str = "UTF-8",
auto_convert_rgb: bool = False,
):
"""Hide a message (string) in an image with the
LSB (Least Significant Bit) technique.
"""
@ -47,14 +48,15 @@ def hide(input_image: Union[str, IO[bytes]],
img = tools.open_image(input_image)
if img.mode not in ['RGB', 'RGBA']:
if img.mode not in ["RGB", "RGBA"]:
if not auto_convert_rgb:
print('The mode of the image is not RGB. Mode is {}'.\
format(img.mode))
answer = input('Convert the image to RGB ? [Y / n]\n') or 'Y'
if answer.lower() == 'n':
raise Exception('Not a RGB image.')
img = img.convert('RGB')
print(
"The mode of the image is not RGB. Mode is {}".format(img.mode)
)
answer = input("Convert the image to RGB ? [Y / n]\n") or "Y"
if answer.lower() == "n":
raise Exception("Not a RGB image.")
img = img.convert("RGB")
img_list = list(img.getdata())
width, height = img.size
@ -62,36 +64,39 @@ def hide(input_image: Union[str, IO[bytes]],
message = str(message_length) + ":" + str(message)
message_bits = "".join(tools.a2bits_list(message, encoding))
message_bits += '0' * ((3 - (len(message_bits) % 3)) % 3)
message_bits += "0" * ((3 - (len(message_bits) % 3)) % 3)
npixels = width * height
len_message_bits = len(message_bits)
if len_message_bits > npixels * 3:
raise Exception("The message you want to hide is too long: {}". \
format(message_length))
raise Exception(
"The message you want to hide is too long: {}".format(
message_length
)
)
while shift != 0:
next(generator)
shift -= 1
while index + 3 <= len_message_bits :
while index + 3 <= len_message_bits:
generated_number = next(generator)
r, g, b, *a = img_list[generated_number]
# Change the Least Significant Bit of each colour component.
r = tools.setlsb(r, message_bits[index])
g = tools.setlsb(g, message_bits[index+1])
b = tools.setlsb(b, message_bits[index+2])
g = tools.setlsb(g, message_bits[index + 1])
b = tools.setlsb(b, message_bits[index + 2])
# Save the new pixel
if img.mode == 'RGBA':
img_list[generated_number] = (r, g , b, a[0])
if img.mode == "RGBA":
img_list[generated_number] = (r, g, b, a[0])
else:
img_list[generated_number] = (r, g , b)
img_list[generated_number] = (r, g, b)
index += 3
# create empty new image of appropriate format
encoded = Image.new('RGB', (img.size))
encoded = Image.new("RGB", (img.size))
# insert saved data into the image
encoded.putdata(img_list)
@ -99,10 +104,12 @@ def hide(input_image: Union[str, IO[bytes]],
return encoded
def reveal(input_image: Union[str, IO[bytes]],
generator: Iterator[int],
shift: int = 0,
encoding: str = 'UTF-8'):
def reveal(
input_image: Union[str, IO[bytes]],
generator: Iterator[int],
shift: int = 0,
encoding: str = "UTF-8",
):
"""Find a message in an image (with the LSB technique).
"""
img = tools.open_image(input_image)
@ -120,7 +127,7 @@ def reveal(input_image: Union[str, IO[bytes]],
generated_number = next(generator)
# color = [r, g, b]
for color in img_list[generated_number]:
buff += (color&1)<<(tools.ENCODINGS[encoding]-1 - count)
buff += (color & 1) << (tools.ENCODINGS[encoding] - 1 - count)
count += 1
if count == tools.ENCODINGS[encoding]:
bitab.append(chr(buff))
@ -130,5 +137,5 @@ def reveal(input_image: Union[str, IO[bytes]],
limit = int("".join(bitab[:-1]))
else:
raise IndexError("Impossible to detect message.")
if len(bitab)-len(str(limit))-1 == limit :
return "".join(bitab)[len(str(limit))+1:]
if len(bitab) - len(str(limit)) - 1 == limit:
return "".join(bitab)[len(str(limit)) + 1 :]