Switch to unified view

a/Allura/allura/model/oauth.py b/Allura/allura/model/oauth.py
1
import os
2
import re
3
import logging
1
import logging
4
import urllib
5
import hmac
6
import hashlib
7
from datetime import timedelta, datetime
8
from hashlib import sha256
9
2
10
import iso8601
11
import pymongo
12
import oauth2 as oauth
3
import oauth2 as oauth
13
from pylons import c, g, request
4
from pylons import c, g
14
5
15
from ming import schema as S
6
from ming import schema as S
16
from ming.orm.ormsession import ThreadLocalORMSession
17
from ming.orm import session, state, MappedClass
18
from ming.orm import FieldProperty, RelationProperty, ForeignIdProperty
7
from ming.orm import FieldProperty, RelationProperty, ForeignIdProperty
8
from ming.orm.declarative import MappedClass
19
9
20
from allura.lib import helpers as h
10
from allura.lib import helpers as h
21
from allura.lib import plugin
22
from .session import main_doc_session, main_orm_session
11
from .session import main_doc_session, main_orm_session
23
from .session import project_doc_session, project_orm_session
12
from .session import project_doc_session, project_orm_session
24
13
25
log = logging.getLogger(__name__)
14
log = logging.getLogger(__name__)
26
15