diff options
author | Mattias Andrée <maandree@operamail.com> | 2012-08-18 17:05:13 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2012-08-18 17:05:13 +0200 |
commit | e27f83da41ed960a14a80bab666373c02e763739 (patch) | |
tree | acbaea05e67bc10ecea691a801fb6802d9dd700e /ponysay.py | |
parent | 10268235a99b1ef3ff72ed8268f857db045ca2aa (diff) | |
parent | f16a89ffffbc323262f6dc9f959ea9a3cf9dbc3d (diff) | |
download | ponysay-e27f83da41ed960a14a80bab666373c02e763739.tar.gz ponysay-e27f83da41ed960a14a80bab666373c02e763739.tar.bz2 ponysay-e27f83da41ed960a14a80bab666373c02e763739.zip |
merge conflict resolve
Diffstat (limited to 'ponysay.py')
-rwxr-xr-x | ponysay.py | 25 |
1 files changed, 8 insertions, 17 deletions
@@ -28,12 +28,6 @@ INSTALLDIR = '/usr' ''' -The user's home directory -''' -HOME = os.environ['HOME'] - - -''' The directories where pony files are stored, ttyponies/ are used if the terminal is Linux VT (also known as TTY) ''' ponydirs = [] @@ -86,14 +80,18 @@ class ponysay(): def __getponypath(self, names = None): ponies = {} - for name in names: - if os.path.isfile(name): - return name + if names != None: + for name in names: + if os.path.isfile(name): + return name for ponydir in ponydirs: for ponyfile in os.listdir(ponydir): ponies[ponyfile[:-5]] = ponydir + ponyfile + if names == None: + names = list(ponies.keys()) + return ponies[names[random.randrange(0, len(names))]] @@ -278,15 +276,8 @@ class ponysay(): def print_pony(self, args): - ponycount = 0 - for ponydir in ponydirs: - ponycount = len(os.listdir(ponydir)) - if ponycount == 0: - sys.stderr.write('All the ponies are missing! Call the Princess!') - exit(1); - if args.message == None: - msg = sys.stdin.read() + msg = sys.stdin.read().strip() else: msg = args.message |