Projet

Général

Profil

0001-python3-fix-implicit-relative-submodule-imports-3114.patch

Paul Marillonnet, 06 mars 2019 17:12

Télécharger (3,78 ko)

Voir les différences: 

Subject: [PATCH] python3: fix implicit relative submodule imports (#31143)


 src/authentic2/idp/saml/saml2_endpoints.py   | 2 +-
 src/authentic2/nonce/__init__.py             | 2 +-
 src/authentic2/saml/models.py                | 2 +-
 src/authentic2/saml/saml2utils.py            | 2 +-
 src/authentic2/saml/shibboleth/afp_parser.py | 2 +-
 src/authentic2_idp_cas/views.py              | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)
src/authentic2/idp/saml/saml2_endpoints.py
68 68 
    get_saml2_metadata, get_sp_options_policy, \
69 69 
    get_entity_id, AUTHENTIC_SAME_ID_SENTINEL
70 70 
import authentic2.saml.saml2utils as saml2utils
71 
from common import kill_django_sessions
71 
from authentic2.idp.saml.common import kill_django_sessions
72 72 
from authentic2.constants import NONCE_FIELD_NAME
73 73 

  		




  74
  74
  
    
from authentic2.idp import signals as idp_signals

  		












  

    
      src/authentic2/nonce/__init__.py
    
  





  1
  
  
    
from utils import accept_nonce, cleanup_nonces

  		




  
  1
  
    
from authentic2.nonce.utils import accept_nonce, cleanup_nonces

  		




  2
  2
  
    

  		




  3
  3
  
    
__all__ = ('accept_nonce', 'cleanup_nonces')

  		












  

    
      src/authentic2/saml/models.py
    
  





  24
  24
  
    
except ImportError:

  		




  25
  25
  
    
    from django.contrib.contenttypes.generic import GenericRelation

  		




  26
  26
  
    

  		




  27
  
  
    
from fields import PickledObjectField, MultiSelectField

  		




  
  27
  
    
from authentic2.saml.fields import PickledObjectField, MultiSelectField

  		




  28
  28
  
    

  		




  29
  29
  
    
from . import app_settings, managers

  		




  30
  30
  
    
from .. import managers as a2_managers

  		












  

    
      src/authentic2/saml/saml2utils.py
    
  





  1
  1
  
    
import xml.etree.ElementTree as etree

  		




  2
  2
  
    
import collections

  		




  3
  3
  
    
from authentic2.compat_lasso import lasso

  		




  4
  
  
    
import x509utils

  		




  
  4
  
    
from authentic2.saml import x509utils

  		




  5
  5
  
    
import base64

  		




  6
  6
  
    
import binascii

  		




  7
  7
  
    
import re

  		












  

    
      src/authentic2/saml/shibboleth/afp_parser.py
    
  





  1
  1
  
    
import xml.etree.ElementTree as ET

  		




  2
  2
  
    

  		




  3
  
  
    
from utils import FancyTreeBuilder

  		




  
  3
  
    
from authentic2.saml.shibboleth.utils import FancyTreeBuilder

  		




  4
  4
  
    

  		




  5
  5
  
    
class NS(object):

  		




  6
  6
  
    
    AFP = 'urn:mace:shibboleth:2.0:afp'

  		












  

    
      src/authentic2_idp_cas/views.py
    
  





  17
  17
  
    
from authentic2.views import logout as logout_view

  		




  18
  18
  
    
from authentic2 import hooks

  		




  19
  19
  
    

  		




  20
  
  
    
from models import Ticket, Service

  		




  21
  
  
    
from utils import make_id

  		




  22
  
  
    
from constants import (SERVICE_PARAM, RENEW_PARAM, GATEWAY_PARAM,

  		




  
  20
  
    
from authentic2_idp_cas.models import Ticket, Service

  		




  
  21
  
    
from authentic2_idp_cas.utils import make_id

  		




  
  22
  
    
from authentic2_idp_cas.constants import (SERVICE_PARAM, RENEW_PARAM, GATEWAY_PARAM,

  		




  23
  23
  
    
        TICKET_PARAM, CANCEL_PARAM, SERVICE_TICKET_PREFIX,

  		




  24
  24
  
    
        INVALID_REQUEST_ERROR, INVALID_TICKET_SPEC_ERROR,

  		




  25
  25
  
    
        INVALID_SERVICE_ERROR, INVALID_TICKET_ERROR,

  		




  26
  
  
    
-