Fixed some bugs.

This commit is contained in:
Cédric Bonhomme 2015-10-06 07:49:11 +02:00
parent cda0578448
commit 28ba1e54cf
6 changed files with 23 additions and 35 deletions

View file

@ -27,7 +27,7 @@ __license__ = "GPLv3"
try:
from stegano import slsb
except:
print "Install stegano: python setup.py install"
print("Install Stegano: sudo pip install Stegano")
from stegano import tools
@ -71,9 +71,9 @@ if options.hide:
img_encoded = slsb.hide(options.input_image_file, secret)
try:
img_encoded.save(options.output_image_file)
except Exception, e:
except Exception as e:
# If hide() returns an error (Too long message).
print e
print(e)
elif options.reveal:
secret = slsb.reveal(options.input_image_file)
@ -82,4 +82,4 @@ elif options.reveal:
with open(options.secret_binary, "w") as f:
f.write(data)
else:
print secret
print(secret)

View file

@ -27,7 +27,7 @@ __license__ = "GPLv3"
try:
from stegano import slsbset
except:
print "Install stegano: python setup.py install"
print("Install stegano: sudo pip install Stegano")
from stegano import tools
@ -77,19 +77,19 @@ if options.hide:
img_encoded = slsbset.hide(options.input_image_file, secret, options.generator_function)
try:
img_encoded.save(options.output_image_file)
except Exception, e:
except Exception as e:
# If hide() returns an error (Too long message).
print e
print(e)
elif options.reveal:
try:
secret = slsbset.reveal(options.input_image_file, options.generator_function)
except IndexError:
print "Impossible to detect message."
print("Impossible to detect message.")
exit(0)
if options.secret_binary != "":
data = tools.base642binary(secret)
with open(options.secret_binary, "w") as f:
f.write(data)
else:
print secret
print(secret)

View file

@ -27,7 +27,7 @@ __license__ = "GPLv3"
try:
from stegano import steganalysisParity
except:
print "Install stegano: python setup.py install"
print("Install Stegano: sudo pip install Stegano")
from PIL import Image

View file

@ -12,8 +12,7 @@ except ImportError:
packages = [
'stegano',
'stegano.exif',
'bin'
'stegano.exif'
]
requires = ['pillow']
@ -23,12 +22,12 @@ with open('README.md', 'r') as f:
setup(
name='Stegano',
version='0.4.2',
version='0.4.3',
author='Cédric Bonhomme',
author_email='cedric@cedricbonhomme.org',
packages=packages,
include_package_data=True,
#scripts=[''],
scripts=['bin/slsb', 'bin/slsb-set', 'bin/steganalysis-parity'],
url='https://bitbucket.org/cedricbonhomme/stegano',
description='A Python Steganography module.',
long_description=readme,
@ -46,14 +45,3 @@ setup(
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)"
]
)
if sys.argv[-1] == "install":
print("Installing binaries")
shutil.copy2("./bin/slsb-set", "/bin/slsb-set")
shutil.copymode("./bin/slsb-set", "/bin/slsb-set")
shutil.copy2("./bin/slsb", "/bin/slsb")
shutil.copymode("./bin/slsb", "/bin/slsb")
shutil.copy2("./bin/steganalysis-parity", "/bin/steganalysis-parity")
shutil.copymode("./bin/steganalysis-parity", "/bin/steganalysis-parity")

View file

@ -28,7 +28,7 @@ import sys
from PIL import Image
import tools
from . import tools
def hide(input_image_file, message):
"""

View file

@ -28,8 +28,8 @@ import sys
from PIL import Image
import tools
import generators
from . import tools
from . import generators
def hide(input_image_file, message, generator_function):
"""