99from django_scopes import scope , scopes_disabled
1010from lxml import etree
1111
12- from eventyay .base .models .settings import GlobalSettings
13- from eventyay .base .models .event import Event
14- from eventyay .base .models .organizer import Organizer as Organiser , Team , TeamInvite
15- from eventyay .base .models .mail import MailTemplate
16- from eventyay .base .models .information import SpeakerInformation
17- from eventyay .base .models .profile import SpeakerProfile
18- from eventyay .base .models .auth import User
19- from eventyay .base .models .auth_token import UserApiToken , ENDPOINTS , generate_api_token
20- from eventyay .base .models .availability import Availability
21- from eventyay .base .models .room import Room
22- from eventyay .base .models .slot import TalkSlot
23- from eventyay .base .models .question import (
12+ from pretalx .common .models .settings import GlobalSettings
13+ from pretalx .event .models import Event , Organiser , Team , TeamInvite
14+ from pretalx .mail .models import MailTemplate
15+ from pretalx .person .models import SpeakerInformation , SpeakerProfile , User , UserApiToken
16+ from pretalx .person .models .auth_token import ENDPOINTS , generate_api_token
17+ from pretalx .schedule .models import Availability , Room , TalkSlot
18+ from pretalx .submission .models import (
2419 Answer ,
2520 AnswerOption ,
26- TalkQuestion as Question ,
27- TalkQuestionVariant as QuestionVariant ,
28- TalkQuestionRequired as QuestionRequired ,
29- )
30- from eventyay .base .models .submission import (
3121 Feedback ,
22+ Question ,
23+ QuestionVariant ,
24+ Resource ,
3225 Review ,
3326 Submission ,
27+ SubmissionType ,
28+ SubmitterAccessCode ,
3429 Tag ,
30+ Track ,
3531)
36- from eventyay .base .models .resource import Resource
37- from eventyay .base .models .type import SubmissionType
38- from eventyay .base .models .access_code import SubmitterAccessCode
39- from eventyay .base .models .track import Track
32+ from pretalx .submission .models .question import QuestionRequired
4033
4134
4235@pytest .fixture (scope = "session" , autouse = True )
@@ -744,7 +737,7 @@ def default_submission_type(event):
744737def speaker (event ):
745738 with scopes_disabled ():
746739 user = User .objects .create_user (
747- password = "speakerpwd1!" , fullname = "Jane Speaker" , email = "jane@speaker.org"
740+ password = "speakerpwd1!" , name = "Jane Speaker" , email = "jane@speaker.org"
748741 )
749742 with scope (event = event ):
750743 SpeakerProfile .objects .create (
@@ -763,7 +756,7 @@ def speaker_client(client, speaker):
763756def other_speaker (event ):
764757 with scopes_disabled ():
765758 user = User .objects .create_user (
766- email = "speaker2@example.com" , password = "speakerpwd1!" , fullname = "Krümelmonster"
759+ email = "speaker2@example.com" , password = "speakerpwd1!" , name = "Krümelmonster"
767760 )
768761 with scope (event = event ):
769762 SpeakerProfile .objects .create (user = user , event = event , biography = "COOKIIIIES!!" )
0 commit comments