Author: matevz
Date: Wed Mar 27 13:36:41 2013
New Revision: 1461573
URL: http://svn.apache.org/r1461573
Log:
Ref. #470, monkeypatching fix
Modified:
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/util.py
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/versioncontrol.py
Modified:
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/util.py
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/util.py?rev=1461573&r1=1461572&r2=1461573&view=diff
==============================================================================
---
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/util.py
(original)
+++
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/util.py
Wed Mar 27 13:36:41 2013
@@ -31,8 +31,10 @@ from trac.core import Component, Compone
class ReplacementComponentMeta(ComponentMeta):
"""Component replacement meta class"""
def __new__(mcs, name, bases, d):
- base_class = bases[0]
- if base_class != Component:
+ if bases[0] != Component:
+ bases = bases[1:]
+ base_class = bases[0]
+
# undo what has been done by ComponentMeta.__new___ for the
# replacement component base class
Modified:
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/versioncontrol.py
URL:
http://svn.apache.org/viewvc/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/versioncontrol.py?rev=1461573&r1=1461572&r2=1461573&view=diff
==============================================================================
---
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/versioncontrol.py
(original)
+++
bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/versioncontrol.py
Wed Mar 27 13:36:41 2013
@@ -27,7 +27,7 @@ import trac.web.api
import trac.resource
from multiproduct.util import ReplacementComponent
-class DbRepositoryProvider(trac.versioncontrol.api.DbRepositoryProvider,
ReplacementComponent):
+class DbRepositoryProvider(ReplacementComponent,
trac.versioncontrol.api.DbRepositoryProvider):
"""Inplace replacement for trac.versioncontrol.api.DbRepositoryProvider.
Filters
repositories based on soft-links to products. Soft links are stored in
'product'
repository attribute, separated by comma."""
@@ -67,14 +67,5 @@ class DbRepositoryProvider(trac.versionc
return super(DbRepositoryProvider, self).get_repositories()
trac.versioncontrol.api.DbRepositoryProvider = DbRepositoryProvider
+trac.versioncontrol.DbRepositoryProvider = DbRepositoryProvider
-class RepositoryManager(trac.versioncontrol.api.RepositoryManager,
ReplacementComponent):
-
- implements(trac.web.api.IRequestFilter,
- trac.resource.IResourceManager,
- trac.versioncontrol.api.IRepositoryProvider)
-
- def __init__(self):
- super(RepositoryManager, self).__init__()
-
-trac.versioncontrol.api.RepositoryManager = RepositoryManager
