mousebot
/
mkv-this
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix crud

This commit is contained in:
mousebot 2020-04-25 23:06:21 -03:00
parent 36f5b25197
commit ac63cb6c7e
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mkv_this/mkv_this_dir.py
View File

@ -112,19 +112,11 @@ def main():
# write it combo!
if args.length:
<< << << < HEAD
writeshortsentence(combo_model, args.sentences,
args.outfile, args.overlap, args.length)
else:
writesentence(combo_model, args.sentences,
args.outfile, args.overlap, args.length)
=======
writeshortsentence(combo_model, args.sentences, args.outfile, args.overlap, args.length)
else:
writesentence(combo_model, args.sentences, args.outfile, args.overlap, args.length)
>>>>>>> testing
# no combining:
else:
@ -135,7 +127,6 @@ def main():
# no --newline:
else:
text_model = mkbtext(text, args.state_size, args.well_formed)
<<<<<<< HEAD
# write it!
if args.length:
@ -145,15 +136,6 @@ def main():
writesentence(text_model, args.sentences,
args.outfile, args.overlap, args.length)
=======
# write it!
if args.length:
writeshortsentence(text_model, args.sentences, args.outfile, args.overlap, args.length)
else:
writesentence(text_model, args.sentences, args.outfile, args.overlap, args.length)
>>>>>>> testing
os.unlink(batchfile)
# print('\n: The options you used are as follows:\n')
@ -167,11 +149,7 @@ def main():
print(': mkv-this ran but did NOT create an output file as requested. this is a very regrettable and dangerous situation. contact the package maintainer asap. soz!')
sys.exit()
<<<<<<< HEAD
=======
>>>>>>> testing
if __name__ == '__main__':
main()

2
setup.py
View File

@ -7,7 +7,7 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
long_description = f.read()
setup(name='mkv-this',
version='0.1.41',
version='0.1.42',
description='cli wrapper for markovify: take a text file or URL, markovify, save the results.',
long_description=long_description,
long_description_content_type='text/markdown',