Fix the imports when separating out the new common.py file.

This commit is contained in:
yackob03 2013-12-27 18:01:44 -05:00
parent 3d899b9f95
commit 6fb6eb64e1
2 changed files with 9 additions and 11 deletions

View file

@ -1,15 +1,11 @@
import logging import logging
import requests
import stripe
from flask import (abort, redirect, request, url_for, render_template, from flask.ext.login import login_user, UserMixin
make_response, Response)
from flask.ext.login import login_user, UserMixin, current_user
from flask.ext.principal import identity_changed from flask.ext.principal import identity_changed
from urlparse import urlparse
from data import model from data import model
from app import app, login_manager from app import app, login_manager
from auth.permissions import QuayDeferredPermissionUser
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View file

@ -4,24 +4,25 @@ import stripe
from flask import (abort, redirect, request, url_for, render_template, from flask import (abort, redirect, request, url_for, render_template,
make_response, Response) make_response, Response)
from flask.ext.login import login_user, UserMixin, current_user from flask.ext.login import current_user
from flask.ext.principal import identity_changed
from urlparse import urlparse from urlparse import urlparse
from data import model from data import model
from app import app, login_manager, mixpanel from app import app, mixpanel
from auth.permissions import (QuayDeferredPermissionUser, from auth.permissions import AdministerOrganizationPermission
AdministerOrganizationPermission)
from util.invoice import renderInvoiceToPdf from util.invoice import renderInvoiceToPdf
from util.seo import render_snapshot from util.seo import render_snapshot
from endpoints.api import get_route_data from endpoints.api import get_route_data
from endpoints.common import common_login from endpoints.common import common_login
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def render_page_template(name): def render_page_template(name):
return render_template(name, route_data = get_route_data()) return render_template(name, route_data = get_route_data())
@app.route('/', methods=['GET'], defaults={'path': ''}) @app.route('/', methods=['GET'], defaults={'path': ''})
@app.route('/repository/<path:path>', methods=['GET']) @app.route('/repository/<path:path>', methods=['GET'])
@app.route('/organization/<path:path>', methods=['GET']) @app.route('/organization/<path:path>', methods=['GET'])
@ -57,6 +58,7 @@ def guide():
def organizations(): def organizations():
return index('') return index('')
@app.route('/user/') @app.route('/user/')
def user(): def user():
return index('') return index('')