Projet

Général

Profil

0001-misc-always-prefix-imported-modules-with-wcs.-34918.patch

Frédéric Péters, 17 juillet 2019 11:16

Télécharger (2,09 ko)

Voir les différences: 

Subject: [PATCH] misc: always prefix imported modules with wcs. (#34918)


 wcs/admin/settings.py                  | 6 +++---
 wcs/formdef.py                         | 2 ++
 wcs/qommon/management/commands/cron.py | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
wcs/admin/settings.py
52 52 
import qommon.ident
53 53 
import qommon.template
54 54 

  		




  55
  
  
    
from formdef import FormDef

  		




  56
  
  
    
from workflows import Workflow

  		




  57
  
  
    
from fields import FieldDefPage, FieldsDirectory

  		




  
  55
  
    
from wcs.formdef import FormDef

  		




  
  56
  
    
from wcs.workflows import Workflow

  		




  58
  57
  
    
from wcs.roles import Role

  		




  59
  58
  
    

  		




  
  59
  
    
from .fields import FieldDefPage, FieldsDirectory

  		




  60
  60
  
    
from .data_sources import NamedDataSourcesDirectory

  		




  61
  61
  
    
from .wscalls import NamedWsCallsDirectory

  		




  62
  62
  
    

  		












  

    
      wcs/formdef.py
    
  





  246
  246
  
    
            cur.close()

  		




  247
  247
  
    

  		




  248
  248
  
    
    def data_class(self, mode=None):

  		




  
  249
  
    
        if not 'formdef' in sys.modules:

  		




  
  250
  
    
            sys.modules['formdef'] = sys.modules[__name__]

  		




  249
  251
  
    
        if hasattr(sys.modules['formdef'], self.url_name.title()):

  		




  250
  252
  
    
            data_class = getattr(sys.modules['formdef'], self.url_name.title())

  		




  251
  253
  
    
            # only use existing data class if it has a reference to this actual

  		












  

    
      wcs/qommon/management/commands/cron.py
    
  





  24
  24
  
    

  		




  25
  25
  
    
from qommon.vendor import locket

  		




  26
  26
  
    
from qommon.cron import cron_worker

  		




  27
  
  
    
from wf.jump import JUMP_TIMEOUT_INTERVAL

  		




  
  27
  
    
from wcs.wf.jump import JUMP_TIMEOUT_INTERVAL

  		




  28
  28
  
    

  		




  29
  29
  
    

  		




  30
  30
  
    
class Command(BaseCommand):

  		




  31
  
  
    
-