Changeset 3bc472 in indico


Ignore:
Timestamp:
02/16/11 10:07:32 (2 years ago)
Author:
Pedro Ferreira <jose.pedro.ferreira@…>
Branches:
master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72
Children:
6e631c
Parents:
71db8f4
Message:

[FIX] MRO, old/new style classes

  • Just fell back to old-style classes in json-rpc methods;
Location:
indico/MaKaC/services/implementation
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • indico/MaKaC/services/implementation/base.py

    rf7f228 r3bc472  
    5050    return datetime(*(time.strptime(dt, format)[0:6])) 
    5151 
     52 
    5253class ExpectedParameterException(ServiceError): 
    5354    """ 
    … …  
    5960        ServiceError.__init__(self, "ERR-P2","'%s': Expected '%s', got instead '%s'" % (paramName, expected, got)) 
    6061 
     62 
    6163class EmptyParameterException(ServiceError): 
    6264    """ 
    … …  
    6567    def __init__(self, paramName=""): 
    6668        ServiceError.__init__(self, "ERR-P3","Expected parameter '%s' is empty"%paramName) 
     69 
    6770 
    6871class ParameterManager(object): 
    … …  
    143146    def setTimezone(self, tz): 
    144147        self._timezone = tz 
     148 
    145149 
    146150class ServiceBase(RequestHandlerBase): 
    … …  
    345349            raise ServiceAccessError(_("Only administrators can perform this operation")) 
    346350 
    347 class TextModificationBase( object ): 
     351class TextModificationBase: 
    348352    """ 
    349353    Base class for text field modification 
    … …  
    376380                return self._value 
    377381 
    378 class HTMLModificationBase( object ): 
     382class HTMLModificationBase: 
    379383    """ 
    380384    Base class for HTML field modification 

  • indico/MaKaC/services/implementation/conference.py

    ra755c1 r3bc472  
    4040from MaKaC.fossils.contribution import IContributionFossil 
    4141 
    42 class ConferenceBase(object): 
     42 
     43class ConferenceBase: 
    4344    """ 
    4445    Base class for conference modification 

  • indico/MaKaC/services/implementation/contribution.py

    ra31107b r3bc472  
    4949        ProtectedDisplayService._checkParams(self) 
    5050 
    51 class ContributionModifBase(ProtectedModificationService, ContributionBase): 
     51class ContributionModifBase(ContributionBase, ProtectedModificationService): 
    5252 
    5353    def _checkParams(self): 

  • indico/MaKaC/services/implementation/material.py

    ra25433 r3bc472  
    8383        ProtectedDisplayService._checkParams(self) 
    8484 
    85 class MaterialModifBase(ProtectedModificationService, MaterialBase): 
     85class MaterialModifBase(MaterialBase, ProtectedModificationService): 
    8686 
    8787    def _checkParams(self): 

  • indico/MaKaC/services/implementation/minutes.py

    r760ed2 r3bc472  
    66from MaKaC.common.utils import isStringHTML,sortContributionByDate 
    77import MaKaC.webinterface.locators as locators 
    8  
    98 
    109 

  • indico/MaKaC/services/implementation/session.py

    ra31107b r3bc472  
    3838            raise ServiceError("ERR-S4", "Invalid session id.") 
    3939 
    40 class SessionModifBase(ProtectedModificationService, SessionBase): 
     40class SessionModifBase(SessionBase, ProtectedModificationService): 
    4141 
    4242    def _checkParams( self ): 
Note: See TracChangeset for help on using the changeset viewer.