Author: reinhard Date: 2010-12-16 15:22:17 -0600 (Thu, 16 Dec 2010) New Revision: 10273
Modified: trunk/gnue-common/ trunk/gnue-common/src/base/plugin.py Log: Moved exception to the end of the file. Property changes on: trunk/gnue-common ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2010-12-03 00:59:15.023999929 +0100 committer: Reinhard Müller <reinhard.muel...@bytewise.at> properties: branch-nick: common + timestamp: 2010-12-16 22:21:53.016000032 +0100 committer: Reinhard Müller <reinhard.muel...@bytewise.at> properties: branch-nick: common Name: bzr:file-ids - src/base/tree.py 9...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fbase%2Ftree.py + src/base/plugin.py 9...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fbase%2Fplugin.py Name: bzr:revision-id:v4 - 3116 reinhard.muel...@bytewise.at-20100426083315-ccfwx2pihuvqn60z 3117 reinhard.muel...@bytewise.at-20100503114756-unpxm52de0towufo 3118 reinhard.muel...@bytewise.at-20100503115129-uvondrz5bvkqubyv 3119 reinhard.muel...@bytewise.at-20100505081835-9peco6k7a2le0mvg 3120 reinhard.muel...@bytewise.at-20100505084742-wn5vtc4a129z8g28 3121 reinhard.muel...@bytewise.at-20100505092131-m2avvsci5w6aj0rv 3122 reinhard.muel...@bytewise.at-20100519151545-pybk8q2s234vzsf2 3123 reinhard.muel...@bytewise.at-20100525101023-xs7k6pkghh9t6fc3 3124 reinhard.muel...@bytewise.at-20100525114015-rj7eb0xdheqkcuql 3125 reinhard.muel...@bytewise.at-20100525145035-j177jbvu10me4mfp 3126 reinhard.muel...@bytewise.at-20100526111738-ic0wot9z1ulg2y1a 3127 reinhard.muel...@bytewise.at-20100612121357-1nf23tuj1tveh1lv 3128 reinhard.muel...@bytewise.at-20100929190642-6pp6cwlicgt2bhhs 3129 reinhard.muel...@bytewise.at-20100929190817-bje4kkvrjrpanut1 3130 reinhard.muel...@bytewise.at-20101016191602-kceb6hdjytt4im93 3131 reinhard.muel...@bytewise.at-20101020175112-o65lqy8lejjrvzaz 3132 reinhard.muel...@bytewise.at-20101020195535-gb2bt2h80mu5j5h4 3133 reinhard.muel...@bytewise.at-20101020203525-nvdwy7b9r84bngco 3134 reinhard.muel...@bytewise.at-20101028150844-49qu2auedxl5b5kv 3135 reinhard.muel...@bytewise.at-20101028152619-p6ytgkke9zw38o7a 3136 reinhard.muel...@bytewise.at-20101102085744-sfxbu24ep3nwxixc 3137 reinhard.muel...@bytewise.at-20101102085857-sgtswbhhj0baf9d7 3138 reinhard.muel...@bytewise.at-20101103071215-929sbj5boj2wcxuu 3139 reinhard.muel...@bytewise.at-20101114130053-ueyx4ilszsilw6hc 3140 reinhard.muel...@bytewise.at-20101114183532-h66yegryl7hcen0f 3141 reinhard.muel...@bytewise.at-20101130142356-cxfqmitx4trkjcja 3142 reinhard.muel...@bytewise.at-20101201235201-z7jjs7xhfmonjcni 3143 reinhard.muel...@bytewise.at-20101202213225-9hj88a0rur552boy 3144 reinhard.muel...@bytewise.at-20101202222236-g81i5zcnxr8l2q7o 3145 reinhard.muel...@bytewise.at-20101202232811-ydwqz1rwr8a17fad 3146 reinhard.muel...@bytewise.at-20101202235915-yhfdb6fvj5znz35y + 3116 reinhard.muel...@bytewise.at-20100426083315-ccfwx2pihuvqn60z 3117 reinhard.muel...@bytewise.at-20100503114756-unpxm52de0towufo 3118 reinhard.muel...@bytewise.at-20100503115129-uvondrz5bvkqubyv 3119 reinhard.muel...@bytewise.at-20100505081835-9peco6k7a2le0mvg 3120 reinhard.muel...@bytewise.at-20100505084742-wn5vtc4a129z8g28 3121 reinhard.muel...@bytewise.at-20100505092131-m2avvsci5w6aj0rv 3122 reinhard.muel...@bytewise.at-20100519151545-pybk8q2s234vzsf2 3123 reinhard.muel...@bytewise.at-20100525101023-xs7k6pkghh9t6fc3 3124 reinhard.muel...@bytewise.at-20100525114015-rj7eb0xdheqkcuql 3125 reinhard.muel...@bytewise.at-20100525145035-j177jbvu10me4mfp 3126 reinhard.muel...@bytewise.at-20100526111738-ic0wot9z1ulg2y1a 3127 reinhard.muel...@bytewise.at-20100612121357-1nf23tuj1tveh1lv 3128 reinhard.muel...@bytewise.at-20100929190642-6pp6cwlicgt2bhhs 3129 reinhard.muel...@bytewise.at-20100929190817-bje4kkvrjrpanut1 3130 reinhard.muel...@bytewise.at-20101016191602-kceb6hdjytt4im93 3131 reinhard.muel...@bytewise.at-20101020175112-o65lqy8lejjrvzaz 3132 reinhard.muel...@bytewise.at-20101020195535-gb2bt2h80mu5j5h4 3133 reinhard.muel...@bytewise.at-20101020203525-nvdwy7b9r84bngco 3134 reinhard.muel...@bytewise.at-20101028150844-49qu2auedxl5b5kv 3135 reinhard.muel...@bytewise.at-20101028152619-p6ytgkke9zw38o7a 3136 reinhard.muel...@bytewise.at-20101102085744-sfxbu24ep3nwxixc 3137 reinhard.muel...@bytewise.at-20101102085857-sgtswbhhj0baf9d7 3138 reinhard.muel...@bytewise.at-20101103071215-929sbj5boj2wcxuu 3139 reinhard.muel...@bytewise.at-20101114130053-ueyx4ilszsilw6hc 3140 reinhard.muel...@bytewise.at-20101114183532-h66yegryl7hcen0f 3141 reinhard.muel...@bytewise.at-20101130142356-cxfqmitx4trkjcja 3142 reinhard.muel...@bytewise.at-20101201235201-z7jjs7xhfmonjcni 3143 reinhard.muel...@bytewise.at-20101202213225-9hj88a0rur552boy 3144 reinhard.muel...@bytewise.at-20101202222236-g81i5zcnxr8l2q7o 3145 reinhard.muel...@bytewise.at-20101202232811-ydwqz1rwr8a17fad 3146 reinhard.muel...@bytewise.at-20101202235915-yhfdb6fvj5znz35y 3147 reinhard.muel...@bytewise.at-20101216212153-y9oprapjl2z2gnh2 Name: bzr:text-parents - src/base/tree.py svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:10118 + src/base/plugin.py svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:10035 Modified: trunk/gnue-common/src/base/plugin.py =================================================================== --- trunk/gnue-common/src/base/plugin.py 2010-12-16 20:56:25 UTC (rev 10272) +++ trunk/gnue-common/src/base/plugin.py 2010-12-16 21:22:17 UTC (rev 10273) @@ -63,46 +63,14 @@ from types import ModuleType from gnue.common.base import errors -__all__ = ['LoadError', 'list_plugins', 'find'] +__all__ = ['list_plugins', 'find', 'LoadError'] + # ============================================================================= -# Exceptions +# Global functions # ============================================================================= # ----------------------------------------------------------------------------- -# Module loading error -# ----------------------------------------------------------------------------- - -class LoadError(errors.AdminError): - """ - Indicates a failure to load a given module. Raised by L{find}. - - If e is an Exception of this class, e.exceptions gives a dictionary with - the keys being the modules that were trying to be imported and the values - being the exception info tuples for the exception that happened trying, and - e.detail is a string containing basically the same info. - """ - def __init__(self, name, exceptions): - - self.name = name - self.exceptions = exceptions - - if self.exceptions: - message = u_("Cannot load plugin '%s'") % self.name - detail = u_("The following plugins failed:\n") - for (name, exc) in self.exceptions.items(): - detail += u"* %s: %s" % (name, exc) - else: - message = u_("Cannot find plugin '%s'") % self.name - detail = None - - errors.AdminError.__init__(self, message) - - if detail: - self.detail = detail - - -# ----------------------------------------------------------------------------- # List all available plugins # ----------------------------------------------------------------------------- @@ -355,6 +323,39 @@ # ============================================================================= +# Exceptions +# ============================================================================= + +class LoadError(errors.AdminError): + """ + Indicates a failure to load a given module. Raised by L{find}. + + If e is an Exception of this class, e.exceptions gives a dictionary with + the keys being the modules that were trying to be imported and the values + being the exception info tuples for the exception that happened trying, and + e.detail is a string containing basically the same info. + """ + def __init__(self, name, exceptions): + + self.name = name + self.exceptions = exceptions + + if self.exceptions: + message = u_("Cannot load plugin '%s'") % self.name + detail = u_("The following plugins failed:\n") + for (name, exc) in self.exceptions.items(): + detail += u"* %s: %s" % (name, exc) + else: + message = u_("Cannot find plugin '%s'") % self.name + detail = None + + errors.AdminError.__init__(self, message) + + if detail: + self.detail = detail + + +# ============================================================================= # Self test code # ============================================================================= _______________________________________________ commit-gnue mailing list commit-gnue@gnu.org http://lists.gnu.org/mailman/listinfo/commit-gnue