diff --git a/plugins/Alias/__init__.py b/plugins/Alias/__init__.py index 12bc915f8..28ef146d4 100644 --- a/plugins/Alias/__init__.py +++ b/plugins/Alias/__init__.py @@ -49,7 +49,7 @@ import plugin reload(plugin) # In case we're being reloaded. # Add more reloads here if you add third-party modules and want them to be # reloaded when this plugin is reloaded. Don't forget to import them as well! -from plugin import findBiggestDollar, AliasError, findAliasCommand # tests +from plugin import findBiggestDollar, AliasError # for the tests. if world.testing: import test diff --git a/plugins/Alias/plugin.py b/plugins/Alias/plugin.py index 97a5d7ef5..24b26de58 100644 --- a/plugins/Alias/plugin.py +++ b/plugins/Alias/plugin.py @@ -79,11 +79,6 @@ class AliasError(Exception): class RecursiveAlias(AliasError): pass -def findAliasCommand(s, alias): - s = re.escape(s) - r = re.compile(r'(?:(^|\[)\s*\b%s\b|\|\s*\b%s\b)' % (s, s)) - return bool(r.search(alias)) - dollarRe = re.compile(r'\$(\d+)') def findBiggestDollar(alias): dollars = dollarRe.findall(alias) @@ -106,8 +101,6 @@ def findBiggestAt(alias): def makeNewAlias(name, alias): original = alias - if findAliasCommand(name, alias): - raise RecursiveAlias biggestDollar = findBiggestDollar(original) biggestAt = findBiggestAt(original) wildcard = '$*' in original diff --git a/plugins/Alias/test.py b/plugins/Alias/test.py index 6ca7a66de..254dbe4b3 100644 --- a/plugins/Alias/test.py +++ b/plugins/Alias/test.py @@ -34,21 +34,6 @@ import supybot.plugin as plugin Alias = plugin.loadPluginModule('Alias') class FunctionsTest(SupyTestCase): - def testFindAliasCommand(self): - s = 'command' - self.failIf(Alias.findAliasCommand(s, '')) - self.failIf(Alias.findAliasCommand(s, 'foo')) - self.failIf(Alias.findAliasCommand(s, 'foo bar [ baz]')) - self.failIf(Alias.findAliasCommand(s, 'foo bar [baz]')) - self.failUnless(Alias.findAliasCommand(s, s)) - self.failUnless(Alias.findAliasCommand(s, ' %s' % s)) - self.failUnless(Alias.findAliasCommand(s, '[%s]' % s)) - self.failUnless(Alias.findAliasCommand(s, '[ %s]' % s)) - self.failUnless(Alias.findAliasCommand(s, 'foo bar [%s]' % s)) - self.failUnless(Alias.findAliasCommand(s, 'foo bar [ %s]' % s)) - self.failUnless(Alias.findAliasCommand(s, 'foo | %s' % s)) - self.failUnless(Alias.findAliasCommand(s, 'foo |%s' % s)) - def testFindBiggestDollar(self): self.assertEqual(Alias.findBiggestDollar(''), 0) self.assertEqual(Alias.findBiggestDollar('foo'), 0) @@ -100,17 +85,6 @@ class AliasTestCase(ChannelPluginTestCase): self.assertResponse('swap 1 2 3 4 5', '2 1 3 4 5') self.assertError('alias add foo "echo $1 @1 $*"') - def testNoRecursion(self): - self.assertError('alias add rotinfinity "rot13 [rotinfinity $1]"') - self.assertNotError('alias add rotinfintynot "rot13 [rotinfinity $1]"') - self.assertNotError('alias add rotinfin "rot13 [rotinfinity $1]"') - - def testNonCanonicalName(self): - self.assertError('alias add FOO foo') - self.assertError('alias add [] foo') - self.assertError('alias add "foo bar" foo') - self.assertError('alias add "foo|bar" foo') - def testChannel(self): self.assertNotError('alias add channel echo $channel') self.assertResponse('alias channel', self.channel)