From fcc9b8edcd6f766e1b754d376282aa0eb51c2f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= Date: Wed, 7 Nov 2012 04:26:21 +0100 Subject: [PATCH] ignore " " and "_" in --restriction --- ponysay-tool.py | 2 +- ponysay.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ponysay-tool.py b/ponysay-tool.py index 9130afcd..36e81d52 100755 --- a/ponysay-tool.py +++ b/ponysay-tool.py @@ -607,7 +607,7 @@ class PonysayTool(): for c in 'ABCDEFGHIJKLMN OPQRSTUVWXYZ': test = test.replace(c, '') if (len(test) == 0) and (len(key) > 0): - data.append((key, makeset(value))) + data.append((key, makeset(value.replace(' ', '')))) everything.append(ponyfile[:-5], data) import cPickle with open(ponydir + 'metadata', 'wb') as file: diff --git a/ponysay.py b/ponysay.py index dabc86aa..da671633 100755 --- a/ponysay.py +++ b/ponysay.py @@ -631,7 +631,7 @@ class Ponysay(): table = [(get_test(cell[:cell.index('=')], cell[cell.index('=') + 1:] ) - for cell in clause.lower().split('+')) + for cell in clause.lower().replace('_', '').replace(' ', '').split('+')) for clause in restriction ]