diff --git a/plugins/Ebay.py b/plugins/Ebay.py index 7de86347f..53f42b3b9 100644 --- a/plugins/Ebay.py +++ b/plugins/Ebay.py @@ -81,7 +81,7 @@ class Ebay(callbacks.PrivmsgCommandAndRegexp): _reopts = re.I | re.S _invalid = re.compile(r'(is invalid, still pending, or no longer in our ' - r'database)', _reopts) + r'database|has been removed by eBay)', _reopts) _info = re.compile(r'eBay item (\d+) \([^)]+\) - ([^<]+)', _reopts) @@ -137,7 +137,7 @@ class Ebay(callbacks.PrivmsgCommandAndRegexp): resp = [] m = self._invalid.search(s) if m: - raise EbayError, 'That auction %s' % m.group(1) + raise EbayError, 'That auction %s.' % m.group(1) m = self._info.search(s) if m: (num, desc) = m.groups() diff --git a/test/test_Ebay.py b/test/test_Ebay.py index 27dfab321..0d60cf99d 100644 --- a/test/test_Ebay.py +++ b/test/test_Ebay.py @@ -35,7 +35,8 @@ class EbayTest(ChannelPluginTestCase): def testAuction(self): self.assertNotError('auction 3053641570') # test 'Invalid Item' checking - self.assertRegexp('auction 2357056673', 'That auction is invalid') + self.assertRegexp('auction 2357056673', + r'That auction (is invalid|has been removed)') self.assertError('auction foobar') # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: