Merge branch 'master' of github.com:chrys87/fenrir

This commit is contained in:
chrys 2016-10-13 00:11:40 +02:00
commit 26ab1701d2
2 changed files with 8 additions and 1 deletions

View File

@ -18,7 +18,7 @@ setup(
author_email="chrys87@web.de", author_email="chrys87@web.de",
# Packages # Packages
packages=find_packages('fenrir'), packages=find_packages('src/fenrir'),
package_dir={'': 'src/fenrir'}, package_dir={'': 'src/fenrir'},
scripts=['src/fenrir/fenrir'], scripts=['src/fenrir/fenrir'],
#entry_points = { #entry_points = {

View File

@ -59,7 +59,14 @@ class punctuationManager():
'=':'equals', '=':'equals',
}, },
'customDict':{ 'customDict':{
'>:)':'evil smiley',
'>:-)':'evil smiley',
'>:)}':'evil beerded smiley',
'>:-)}':'evil beerded smiley',
':)':'smiley', ':)':'smiley',
':-)':'smiley',
':)}':'beerded smiley',
':-)}':'beerded smiley',
';)':'winking face', ';)':'winking face',
'XD':'loool', 'XD':'loool',
':@':'angry face', ':@':'angry face',