fix crud
This commit is contained in:
parent
36f5b25197
commit
ac63cb6c7e
|
@ -112,19 +112,11 @@ def main():
|
||||||
|
|
||||||
# write it combo!
|
# write it combo!
|
||||||
if args.length:
|
if args.length:
|
||||||
|
|
||||||
|
|
||||||
<< << << < HEAD
|
|
||||||
writeshortsentence(combo_model, args.sentences,
|
writeshortsentence(combo_model, args.sentences,
|
||||||
args.outfile, args.overlap, args.length)
|
args.outfile, args.overlap, args.length)
|
||||||
else:
|
else:
|
||||||
writesentence(combo_model, args.sentences,
|
writesentence(combo_model, args.sentences,
|
||||||
args.outfile, args.overlap, args.length)
|
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:
|
# no combining:
|
||||||
else:
|
else:
|
||||||
|
@ -135,7 +127,6 @@ def main():
|
||||||
# no --newline:
|
# no --newline:
|
||||||
else:
|
else:
|
||||||
text_model = mkbtext(text, args.state_size, args.well_formed)
|
text_model = mkbtext(text, args.state_size, args.well_formed)
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
# write it!
|
# write it!
|
||||||
if args.length:
|
if args.length:
|
||||||
|
@ -145,15 +136,6 @@ def main():
|
||||||
writesentence(text_model, args.sentences,
|
writesentence(text_model, args.sentences,
|
||||||
args.outfile, args.overlap, args.length)
|
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)
|
os.unlink(batchfile)
|
||||||
|
|
||||||
# print('\n: The options you used are as follows:\n')
|
# 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!')
|
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()
|
sys.exit()
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
|
|
||||||
=======
|
|
||||||
|
|
||||||
>>>>>>> testing
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -7,7 +7,7 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
|
||||||
long_description = f.read()
|
long_description = f.read()
|
||||||
|
|
||||||
setup(name='mkv-this',
|
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.',
|
description='cli wrapper for markovify: take a text file or URL, markovify, save the results.',
|
||||||
long_description=long_description,
|
long_description=long_description,
|
||||||
long_description_content_type='text/markdown',
|
long_description_content_type='text/markdown',
|
||||||
|
|
Loading…
Reference in New Issue