Skip to content

Commit 7ba2f54

Browse files
committed
Cleanup imports and context processors
1 parent d78e671 commit 7ba2f54

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+484
-555
lines changed

app/__init__.py

Lines changed: 12 additions & 372 deletions
Large diffs are not rendered by default.

app/api/__init__.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
InvalidServiceError,
1212
ServerError,
1313
)
14-
from .attendees import api as attendees_api
15-
from .events import api as event_api
16-
from .exports import api as exports_api
17-
from .extras import api as extras_api
18-
from .imports import api as imports_api
19-
from .login import api as login_api
20-
from .microlocations import api as microlocation_api
21-
from .notifications import api as notifications_api
22-
from .sessions import api as session_api
23-
from .speakers import api as speaker_api
24-
from .sponsors import api as sponsor_api
25-
from .tickets import api as tickets_apt
26-
from .tracks import api as track_api
27-
from .users import api as users_api
14+
from app.api.attendees import api as attendees_api
15+
from app.api.events import api as event_api
16+
from app.api.exports import api as exports_api
17+
from app.api.extras import api as extras_api
18+
from app.api.imports import api as imports_api
19+
from app.api.login import api as login_api
20+
from app.api.microlocations import api as microlocation_api
21+
from app.api.notifications import api as notifications_api
22+
from app.api.sessions import api as session_api
23+
from app.api.speakers import api as speaker_api
24+
from app.api.sponsors import api as sponsor_api
25+
from app.api.tickets import api as tickets_apt
26+
from app.api.tracks import api as track_api
27+
from app.api.users import api as users_api
2828

2929
api_v1 = Blueprint('api', __name__, url_prefix='/api/v1')
3030

app/api/attendees.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
from app.api.tickets import ORDER, TICKET
44
from app.helpers.ticketing import TicketingManager
55

6-
from .helpers.helpers import (
6+
from app.api.helpers.helpers import (
77
requires_auth,
88
can_access)
9-
from .helpers.utils import POST_RESPONSES
10-
from .helpers.utils import Resource
11-
from .helpers import custom_fields as fields
9+
from app.api.helpers.utils import POST_RESPONSES
10+
from app.api.helpers.utils import Resource
11+
from app.api.helpers import custom_fields as fields
1212

1313
api = Namespace('attendees', description='Attendees', path='/')
1414

app/api/events.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
from app.models.users_events_roles import UsersEventsRoles
1818
from helpers.special_fields import EventTypeField, EventTopicField, \
1919
EventPrivacyField, EventSubTopicField, EventStateField
20-
from .helpers import custom_fields as fields
21-
from .helpers.helpers import requires_auth, parse_args, \
20+
from app.api.helpers import custom_fields as fields
21+
from app.api.helpers.helpers import requires_auth, parse_args, \
2222
can_access, fake_marshal_with, fake_marshal_list_with, erase_from_dict
23-
from .helpers.utils import PAGINATED_MODEL, PaginatedResourceBase, \
23+
from app.api.helpers.utils import PAGINATED_MODEL, PaginatedResourceBase, \
2424
PAGE_PARAMS, POST_RESPONSES, PUT_RESPONSES, BaseDAO, ServiceDAO
25-
from .helpers.utils import Resource, ETAG_HEADER_DEFN
25+
from app.api.helpers.utils import Resource, ETAG_HEADER_DEFN
2626

2727
api = Namespace('events', description='Events')
2828

app/api/helpers/import_helpers.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
from app.helpers.update_version import VersionUpdater
1818
from app.models.import_jobs import ImportJob
1919
from errors import BaseError, ServerError, NotFoundError
20-
from .non_apis import CustomFormDAO
21-
from ..events import DAO as EventDAO, LinkDAO as SocialLinkDAO
22-
from ..microlocations import DAO as MicrolocationDAO
23-
from ..sessions import DAO as SessionDAO, TypeDAO as SessionTypeDAO
24-
from ..speakers import DAO as SpeakerDAO
25-
from ..sponsors import DAO as SponsorDAO
26-
from ..tracks import DAO as TrackDAO
20+
from app.api.helpers.non_apis import CustomFormDAO
21+
from app.api.events import DAO as EventDAO, LinkDAO as SocialLinkDAO
22+
from app.api.microlocations import DAO as MicrolocationDAO
23+
from app.api.sessions import DAO as SessionDAO, TypeDAO as SessionTypeDAO
24+
from app.api.speakers import DAO as SpeakerDAO
25+
from app.api.sponsors import DAO as SponsorDAO
26+
from app.api.tracks import DAO as TrackDAO
2727

2828
IMPORT_SERIES = [
2929
('social_links', SocialLinkDAO),

app/api/helpers/tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
from errors import BaseError, ServerError
1515
from export_helpers import send_export_mail
1616
from import_helpers import update_import_job, send_import_mail
17-
from ..exports import event_export_task_base
18-
from ..imports import import_event_task_base
17+
from app.api.exports import event_export_task_base
18+
from app.api.imports import import_event_task_base
1919

2020

2121
@celery.task(base=RequestContextTask, name='import.event', bind=True, throws=(BaseError,))

app/api/helpers/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from app.helpers.data import update_version
99
from app.models.event import Event as EventModel
10-
from .error_docs import (
10+
from app.api.helpers.error_docs import (
1111
notfound_error_model,
1212
notauthorized_error_model,
1313
validation_error_model,

app/api/login.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from flask.ext.restplus import Resource, Namespace
44
from flask_jwt import JWTError
55

6-
from .helpers import custom_fields as fields
7-
from .helpers.errors import NotAuthorizedError
6+
from app.api.helpers import custom_fields as fields
7+
from app.api.helpers.errors import NotAuthorizedError
88

99
api = Namespace('login', description='Login')
1010

app/api/microlocations.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
from flask.ext.restplus import Namespace
22

33
from app.models.microlocation import Microlocation as MicrolocationModel
4-
from .helpers import custom_fields as fields
5-
from .helpers.helpers import (
4+
from app.api.helpers import custom_fields as fields
5+
from app.api.helpers.helpers import (
66
can_create,
77
can_update,
88
can_delete,
99
requires_auth
1010
)
11-
from .helpers.utils import PAGINATED_MODEL, PaginatedResourceBase, ServiceDAO, \
11+
from app.api.helpers.utils import PAGINATED_MODEL, PaginatedResourceBase, ServiceDAO, \
1212
PAGE_PARAMS, POST_RESPONSES, PUT_RESPONSES, SERVICE_RESPONSES
13-
from .helpers.utils import Resource, ETAG_HEADER_DEFN
13+
from app.api.helpers.utils import Resource, ETAG_HEADER_DEFN
1414

1515
api = Namespace('microlocations', description='Microlocations', path='/')
1616

app/api/notifications.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
from app.helpers.data import DataManager
44
from app.helpers.data_getter import DataGetter
55
from app.models.notifications import Notification as NotificationModel
6-
from .helpers import custom_fields as fields
7-
from .helpers.helpers import (
6+
from app.api.helpers import custom_fields as fields
7+
from app.api.helpers.helpers import (
88
can_create,
99
requires_auth
1010
)
11-
from .helpers.utils import PAGINATED_MODEL, ServiceDAO, \
11+
from app.api.helpers.utils import PAGINATED_MODEL, ServiceDAO, \
1212
POST_RESPONSES
13-
from .helpers.utils import Resource
13+
from app.api.helpers.utils import Resource
1414

1515
api = Namespace('notifications', description='Notifications', path='/')
1616

0 commit comments

Comments
 (0)