Merge into trunk : source_loading : Code : Ibid

Status:	Merged
Approved by:	Stefano Rivera on 2013-01-30
Approved revision:	1057
Merged at revision:	1058
Proposed branch:	lp:~gertburger/ibid/source_loading
Merge into:	lp:ibid
Diff against target:	24 lines (+14/-0) 1 file modified ibid/source/__init__.py (+14/-0)
To merge this branch:	bzr merge lp:~gertburger/ibid/source_loading
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Stefano Rivera		2013-01-26	Approve on 2013-01-26
Review via email: mp+145058@code.launchpad.net

Commit message

Allow out of tree plugins in the ibid.source module, like ibid.plugins

Revision history for this message

Stefano Rivera (stefanor) wrote on 2013-01-26:

#

Looks like it works. Thanks!

review: Approve

Revision history for this message

Ibid Branch Auto-Lander (ibid-tarmac) wrote on 2013-01-26:

#

Download full text (15.6 KiB)

The attempt to merge lp:~gertburger/ibid/source_loading into lp:ibid failed. Below is the output from the failed tests.

ibid.test.plugins.test_calc
  CalcTest
    test_basic ... [SKIPPED]
    test_too_big ... [SKIPPED]
ibid.test.plugins.test_conversions
  CurrencyConversionTest
    test_conversion ... [SKIPPED]
  CurrencyLookupTest
    test_common_currencies ... [ERROR]
    test_country ... [ERROR]
    test_country_association ... [ERROR]
    test_fallthrough ... [ERROR]
    test_tld ... [ERROR]
  UnihanTest
    test_simp_trad ... [SKIPPED]
ibid.test.plugins.test_core
  TestAddressed
    test_happy_prefix_names ... [OK]
    test_happy_suffix_names ... [OK]
    test_non_messages ... [OK]
    test_sad_prefix_names ... [OK]
    test_sad_suffix_names ... [OK]
    test_strip_punct ... [OK]
ibid.test.plugins.test_factoid
  FactoidTest
    test_also ... [SKIPPED]
    test_append ... [SKIPPED]
    test_duplicate_names ... [SKIPPED]
    test_empty ... [SKIPPED]
    test_forget_multiple ... [SKIPPED]
    test_forget_wildcard ... [SKIPPED]
    test_get_case ... [SKIPPED]
    test_modify_nothing ... [SKIPPED]
    test_multiple_copula ... [SKIPPED]
    test_name_punctuation ... [SKIPPED]
    test_same_as_nothing ... [SKIPPED]
    test_search_case ... [SKIPPED]
    test_search_unescape ... [SKIPPED]
    test_string_replace ... [SKIPPED]
    test_string_transliterate ... [SKIPPED]
    test_unicode_name ... [SKIPPED]
    test_wildcard_tamecard ... [SKIPPED]
ibid.test.plugins.test_google
  GDefineTest
    test_basic ... [SKIPPED]
    test_unicode_latin ... [SKIPPED]
ibid.test.plugins.test_url
  TestURLGrabber
    test_bad_grabs ... ...

The attempt to merge lp:~gertburger/ibid/source_loading into lp:ibid failed. Below is the output from the failed tests.

ibid.test.plugins.test_calc
  CalcTest
    test_basic ...                                                    [SKIPPED]
    test_too_big ...                                                  [SKIPPED]
ibid.test.plugins.test_conversions
  CurrencyConversionTest
    test_conversion ...                                               [SKIPPED]
  CurrencyLookupTest
    test_common_currencies ...                                          [ERROR]
    test_country ...                                                    [ERROR]
    test_country_association ...                                        [ERROR]
    test_fallthrough ...                                                [ERROR]
    test_tld ...                                                        [ERROR]
  UnihanTest
    test_simp_trad ...                                                [SKIPPED]
ibid.test.plugins.test_core
  TestAddressed
    test_happy_prefix_names ...                                            [OK]
    test_happy_suffix_names ...                                            [OK]
    test_non_messages ...                                                  [OK]
    test_sad_prefix_names ...                                              [OK]
    test_sad_suffix_names ...                                              [OK]
    test_strip_punct ...                                                   [OK]
ibid.test.plugins.test_factoid
  FactoidTest
    test_also ...                                                     [SKIPPED]
    test_append ...                                                   [SKIPPED]
    test_duplicate_names ...                                          [SKIPPED]
    test_empty ...                                                    [SKIPPED]
    test_forget_multiple ...                                          [SKIPPED]
    test_forget_wildcard ...                                          [SKIPPED]
    test_get_case ...                                                 [SKIPPED]
    test_modify_nothing ...                                           [SKIPPED]
    test_multiple_copula ...                                          [SKIPPED]
    test_name_punctuation ...                                         [SKIPPED]
    test_same_as_nothing ...                                          [SKIPPED]
    test_search_case ...                                              [SKIPPED]
    test_search_unescape ...                                          [SKIPPED]
    test_string_replace ...                                           [SKIPPED]
    test_string_transliterate ...                                     [SKIPPED]
    test_unicode_name ...                                             [SKIPPED]
    test_wildcard_tamecard ...                                        [SKIPPED]
ibid.test.plugins.test_google
  GDefineTest
    test_basic ...                                                    [SKIPPED]
    test_unicode_latin ...                                            [SKIPPED]
ibid.test.plugins.test_url
  TestURLGrabber
    test_bad_grabs ...                                                     [OK]
    test_good_grabs ...                                                    [OK]
ibid.test.test_core
  TestDispatcher
    test_call_later_args ...                                               [OK]
    test_call_later_kwargs ...                                             [OK]
    test_call_later_multi_reply ...                                        [OK]
    test_call_later_no_args ...                                            [OK]
    test_call_later_reply ...                                              [OK]
    test_dispatch_broken_processor ...                                     [OK]
    test_dispatch_double_reply ...                                         [OK]
    test_dispatch_no_processors ...                                        [OK]
    test_dispatch_noop_processor ...                                       [OK]
    test_dispatch_reply_send_invalid_source ...                            [OK]
    test_dispatch_reply_send_valid_source ...                              [OK]
    test_dispatch_simple_reply ...                                         [OK]
    test_process_broken_processor ...                                      [OK]
    test_process_double_reply ...                                          [OK]
    test_process_no_processors ...                                         [OK]
    test_process_noop_processor ...                                        [OK]
    test_process_reply_send_invalid_source ...                             [OK]
    test_process_reply_send_valid_source ...                               [OK]
    test_process_simple_reply ...                                          [OK]
ibid.test.test_event
  TestEvent
    test_None_response ...                                                 [OK]
    test_attr ...                                                          [OK]
    test_complex_dict_response ...                                         [OK]
    test_complex_dict_with_kwargs_response ...                             [OK]
    test_empty_event ...                                                   [OK]
    test_simple_dict_response ...                                          [OK]
    test_str_kwargs_response ...                                           [OK]
    test_str_response ...                                                  [OK]
    test_str_response_processed_unprocessed ...                            [OK]
    test_str_response_twice ...                                            [OK]
    test_str_response_unprocessed ...                                      [OK]
    test_str_response_with_channel ...                                     [OK]
    test_unicode_params_response ...                                       [OK]
    test_unicode_response ...                                              [OK]
    test_unicode_tuple_params_response ...                                 [OK]
ibid.test.test_utils
  TestUtils
    test_ago ...                                                           [OK]
  TestUtilsNetwork
    test_get_country_codes ...                                             [OK]

===============================================================================
[SKIPPED]
PluginTestCase doesn't work with SQLAlchemy 0.6

ibid.test.plugins.test_calc.CalcTest.test_basic
ibid.test.plugins.test_calc.CalcTest.test_too_big
ibid.test.plugins.test_conversions.CurrencyConversionTest.test_conversion
ibid.test.plugins.test_conversions.UnihanTest.test_simp_trad
ibid.test.plugins.test_factoid.FactoidTest.test_also
ibid.test.plugins.test_factoid.FactoidTest.test_append
ibid.test.plugins.test_factoid.FactoidTest.test_duplicate_names
ibid.test.plugins.test_factoid.FactoidTest.test_empty
ibid.test.plugins.test_factoid.FactoidTest.test_forget_multiple
ibid.test.plugins.test_factoid.FactoidTest.test_forget_wildcard
ibid.test.plugins.test_factoid.FactoidTest.test_get_case
ibid.test.plugins.test_factoid.FactoidTest.test_modify_nothing
ibid.test.plugins.test_factoid.FactoidTest.test_multiple_copula
ibid.test.plugins.test_factoid.FactoidTest.test_name_punctuation
ibid.test.plugins.test_factoid.FactoidTest.test_same_as_nothing
ibid.test.plugins.test_factoid.FactoidTest.test_search_case
ibid.test.plugins.test_factoid.FactoidTest.test_search_unescape
ibid.test.plugins.test_factoid.FactoidTest.test_string_replace
ibid.test.plugins.test_factoid.FactoidTest.test_string_transliterate
ibid.test.plugins.test_factoid.FactoidTest.test_unicode_name
ibid.test.plugins.test_factoid.FactoidTest.test_wildcard_tamecard
ibid.test.plugins.test_google.GDefineTest.test_basic
ibid.test.plugins.test_google.GDefineTest.test_unicode_latin
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/stefanor/ibid/tarmac-trunk/ibid/test/plugins/test_conversions.py", line 30, in test_common_currencies
    self.assertEqual(self.processor.resolve_currency('pound', True), 'GBP')
  File "/home/stefanor/ibid/tarmac-trunk/ibid/plugins/conversions.py", line 390, in resolve_currency
    self._load_currencies()
  File "/home/stefanor/ibid/tarmac-trunk/ibid/plugins/conversions.py", line 317, in _load_currencies
    'conversions/iso4217.xml')
  File "/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py", line 68, in cacheable_download
    f = _cacheable_download(url, cachefile, headers, timeout)
  File "/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py", line 116, in _cacheable_download
    connection = urllib2.urlopen(req, **kwargs)
  File "/usr/lib/python2.7/urllib2.py", line 126, in urlopen
    return _opener.open(url, data, timeout)
  File "/usr/lib/python2.7/urllib2.py", line 406, in open
    response = meth(req, response)
  File "/usr/lib/python2.7/urllib2.py", line 519, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.7/urllib2.py", line 444, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.7/urllib2.py", line 378, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.7/urllib2.py", line 527, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 404: Not Found

ibid.test.plugins.test_conversions.CurrencyLookupTest.test_common_currencies
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/stefanor/ibid/tarmac-trunk/ibid/test/plugins/test_conversions.py", line 45, in test_country
    self.assertEqual(self.processor.resolve_currency('united kingdom', True), 'GBP')
  File "/home/stefanor/ibid/tarmac-trunk/ibid/plugins/conversions.py", line 390, in resolve_currency
    self._load_currencies()
  File "/home/stefanor/ibid/tarmac-trunk/ibid/plugins/conversions.py", line 317, in _load_currencies
    'conversions/iso4217.xml')
  File "/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py", line 68, in cacheable_download
    f = _cacheable_download(url, cachefile, headers, timeout)
  File "/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py", line 116, in _cacheable_download
    connection = urllib2.urlopen(req, **kwargs)
  File "/usr/lib/python2.7/urllib2.py", line 126, in urlopen
    return _opener.open(url, data, timeout)
  File "/usr/lib/python2.7/urllib2.py", line 406, in open
    response = meth(req, response)
  File "/usr/lib/python2.7/urllib2.py", line 519, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.7/urllib2.py", line 444, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.7/urllib2.py", line 378, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.7/urllib2.py", line 527, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 404: Not Found

ibid.test.plugins.test_conversions.CurrencyLookupTest.test_country
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/stefanor/ibid/tarmac-trunk/ibid/test/plugins/test_conversions.py", line 27, in test_country_association
    self.assertTrue(self.processor._load_currencies())
  File "/home/stefanor/ibid/tarmac-trunk/ibid/plugins/conversions.py", line 317, in _load_currencies
    'conversions/iso4217.xml')
  File "/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py", line 68, in cacheable_download
    f = _cacheable_download(url, cachefile, headers, timeout)
  File "/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py", line 116, in _cacheable_download
    connection = urllib2.urlopen(req, **kwargs)
  File "/usr/lib/python2.7/urllib2.py", line 126, in urlopen
    return _opener.open(url, data, timeout)
  File "/usr/lib/python2.7/urllib2.py", line 406, in open
    response = meth(req, response)
  File "/usr/lib/python2.7/urllib2.py", line 519, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.7/urllib2.py", line 444, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.7/urllib2.py", line 378, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.7/urllib2.py", line 527, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 404: Not Found

ibid.test.plugins.test_conversions.CurrencyLookupTest.test_country_association
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/stefanor/ibid/tarmac-trunk/ibid/test/plugins/test_conversions.py", line 50, in test_fallthrough
    self.assertFalse(self.processor.resolve_currency('oz', False))
  File "/home/stefanor/ibid/tarmac-trunk/ibid/plugins/conversions.py", line 390, in resolve_currency
    self._load_currencies()
  File "/home/stefanor/ibid/tarmac-trunk/ibid/plugins/conversions.py", line 317, in _load_currencies
    'conversions/iso4217.xml')
  File "/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py", line 68, in cacheable_download
    f = _cacheable_download(url, cachefile, headers, timeout)
  File "/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py", line 116, in _cacheable_download
    connection = urllib2.urlopen(req, **kwargs)
  File "/usr/lib/python2.7/urllib2.py", line 126, in urlopen
    return _opener.open(url, data, timeout)
  File "/usr/lib/python2.7/urllib2.py", line 406, in open
    response = meth(req, response)
  File "/usr/lib/python2.7/urllib2.py", line 519, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.7/urllib2.py", line 444, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.7/urllib2.py", line 378, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.7/urllib2.py", line 527, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 404: Not Found

ibid.test.plugins.test_conversions.CurrencyLookupTest.test_fallthrough
===============================================================================
[ERROR]
Traceback (most recent call last):
  File "/home/stefanor/ibid/tarmac-trunk/ibid/test/plugins/test_conversions.py", line 36, in test_tld
    self.assertEqual(self.processor.resolve_currency('.za', True), 'ZAR')
  File "/home/stefanor/ibid/tarmac-trunk/ibid/plugins/conversions.py", line 390, in resolve_currency
    self._load_currencies()
  File "/home/stefanor/ibid/tarmac-trunk/ibid/plugins/conversions.py", line 317, in _load_currencies
    'conversions/iso4217.xml')
  File "/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py", line 68, in cacheable_download
    f = _cacheable_download(url, cachefile, headers, timeout)
  File "/home/stefanor/ibid/tarmac-trunk/ibid/utils/__init__.py", line 116, in _cacheable_download
    connection = urllib2.urlopen(req, **kwargs)
  File "/usr/lib/python2.7/urllib2.py", line 126, in urlopen
    return _opener.open(url, data, timeout)
  File "/usr/lib/python2.7/urllib2.py", line 406, in open
    response = meth(req, response)
  File "/usr/lib/python2.7/urllib2.py", line 519, in http_response
    'http', request, response, code, msg, hdrs)
  File "/usr/lib/python2.7/urllib2.py", line 444, in error
    return self._call_chain(*args)
  File "/usr/lib/python2.7/urllib2.py", line 378, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.7/urllib2.py", line 527, in http_error_default
    raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
urllib2.HTTPError: HTTP Error 404: Not Found

ibid.test.plugins.test_conversions.CurrencyLookupTest.test_tld
-------------------------------------------------------------------------------
Ran 72 tests in 1.478s

FAILED (skips=23, errors=5, successes=44)

 === modified file 'ibid/source/__init__.py'
 --- ibid/source/__init__.py	2010-01-18 22:53:52 +0000
 +++ ibid/source/__init__.py	2013-01-26 10:46:24 +0000
@@ -3,6 +3,20 @@
  from copy import copy
++try:
++    from twisted.plugin import pluginPackagePaths
++except ImportError:
++    # Not available in Twisted 2.5.0 in Ubuntu hardy
++    # This is straight from twisted.plugin
++    import os.path
++    import sys
++    def pluginPackagePaths(name):
++        package = name.split('.')
++        return [os.path.abspath(os.path.join(x, *package)) for x in sys.path
++            if not os.path.exists(os.path.join(x, *package + ['__init__.py']))]
++
++__path__ = pluginPackagePaths(__name__) + __path__
++
  class IbidSourceFactory(object):
      supports = ()

Ibid

Merge lp:~gertburger/ibid/source_loading into lp:ibid

Commit message

Description of the change

Preview Diff

Subscribers