aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxray7224 <jessica@megworld.co.uk>2013-07-22 17:06:00 +0100
committerxray7224 <jessica@megworld.co.uk>2013-07-22 17:06:00 +0100
commit005181b1663a05e55faa56a474cf6f5d81a255c9 (patch)
tree9367a55e29ec2d8432c7ab46acb671fff2f7e472
parent657263abdf9b47f1598a7633c1e0039d0eb7b043 (diff)
downloadmediagoblin-005181b1663a05e55faa56a474cf6f5d81a255c9.tar.lz
mediagoblin-005181b1663a05e55faa56a474cf6f5d81a255c9.tar.xz
mediagoblin-005181b1663a05e55faa56a474cf6f5d81a255c9.zip
Renames OAuth1 code to federation
-rw-r--r--mediagoblin/oauth/__init__.py (renamed from mediagoblin/federation/__init__.py)0
-rw-r--r--mediagoblin/oauth/exceptions.py (renamed from mediagoblin/federation/exceptions.py)0
-rw-r--r--mediagoblin/oauth/forms.py (renamed from mediagoblin/federation/forms.py)0
-rw-r--r--mediagoblin/oauth/oauth.py (renamed from mediagoblin/federation/oauth.py)0
-rw-r--r--mediagoblin/oauth/routing.py (renamed from mediagoblin/federation/routing.py)16
-rw-r--r--mediagoblin/oauth/tools/__init__.py (renamed from mediagoblin/federation/tools/__init__.py)0
-rw-r--r--mediagoblin/oauth/tools/forms.py (renamed from mediagoblin/federation/tools/forms.py)0
-rw-r--r--mediagoblin/oauth/tools/request.py (renamed from mediagoblin/federation/tools/request.py)0
-rw-r--r--mediagoblin/oauth/views.py (renamed from mediagoblin/federation/views.py)10
9 files changed, 13 insertions, 13 deletions
diff --git a/mediagoblin/federation/__init__.py b/mediagoblin/oauth/__init__.py
index 719b56e7..719b56e7 100644
--- a/mediagoblin/federation/__init__.py
+++ b/mediagoblin/oauth/__init__.py
diff --git a/mediagoblin/federation/exceptions.py b/mediagoblin/oauth/exceptions.py
index 5eccba34..5eccba34 100644
--- a/mediagoblin/federation/exceptions.py
+++ b/mediagoblin/oauth/exceptions.py
diff --git a/mediagoblin/federation/forms.py b/mediagoblin/oauth/forms.py
index 94c7cb52..94c7cb52 100644
--- a/mediagoblin/federation/forms.py
+++ b/mediagoblin/oauth/forms.py
diff --git a/mediagoblin/federation/oauth.py b/mediagoblin/oauth/oauth.py
index 8229c47d..8229c47d 100644
--- a/mediagoblin/federation/oauth.py
+++ b/mediagoblin/oauth/oauth.py
diff --git a/mediagoblin/federation/routing.py b/mediagoblin/oauth/routing.py
index bc3a7a7e..e45077bb 100644
--- a/mediagoblin/federation/routing.py
+++ b/mediagoblin/oauth/routing.py
@@ -18,26 +18,26 @@ from mediagoblin.tools.routing import add_route
# client registration & oauth
add_route(
- "mediagoblin.federation",
+ "mediagoblin.oauth",
"/api/client/register",
- "mediagoblin.federation.views:client_register"
+ "mediagoblin.oauth.views:client_register"
)
add_route(
- "mediagoblin.federation",
+ "mediagoblin.oauth",
"/oauth/request_token",
- "mediagoblin.federation.views:request_token"
+ "mediagoblin.oauth.views:request_token"
)
add_route(
- "mediagoblin.federation",
+ "mediagoblin.oauth",
"/oauth/authorize",
- "mediagoblin.federation.views:authorize",
+ "mediagoblin.oauth.views:authorize",
)
add_route(
- "mediagoblin.federation",
+ "mediagoblin.oauth",
"/oauth/access_token",
- "mediagoblin.federation.views:access_token"
+ "mediagoblin.oauth.views:access_token"
)
diff --git a/mediagoblin/federation/tools/__init__.py b/mediagoblin/oauth/tools/__init__.py
index e69de29b..e69de29b 100644
--- a/mediagoblin/federation/tools/__init__.py
+++ b/mediagoblin/oauth/tools/__init__.py
diff --git a/mediagoblin/federation/tools/forms.py b/mediagoblin/oauth/tools/forms.py
index e3eb3298..e3eb3298 100644
--- a/mediagoblin/federation/tools/forms.py
+++ b/mediagoblin/oauth/tools/forms.py
diff --git a/mediagoblin/federation/tools/request.py b/mediagoblin/oauth/tools/request.py
index 6e484bb6..6e484bb6 100644
--- a/mediagoblin/federation/tools/request.py
+++ b/mediagoblin/oauth/tools/request.py
diff --git a/mediagoblin/federation/views.py b/mediagoblin/oauth/views.py
index 5bb93a68..116eb023 100644
--- a/mediagoblin/federation/views.py
+++ b/mediagoblin/oauth/views.py
@@ -18,7 +18,7 @@ import datetime
from oauthlib.oauth1 import (RequestTokenEndpoint, AuthorizationEndpoint,
AccessTokenEndpoint)
-
+
from mediagoblin.decorators import require_active_login
from mediagoblin.tools.translate import pass_to_ugettext
from mediagoblin.meddleware.csrf import csrf_exempt
@@ -28,10 +28,10 @@ from mediagoblin.tools.response import (render_to_response, redirect,
form_response)
from mediagoblin.tools.crypto import random_string
from mediagoblin.tools.validator import validate_email, validate_url
-from mediagoblin.federation.forms import AuthorizeForm
-from mediagoblin.federation.oauth import GMGRequestValidator, GMGRequest
-from mediagoblin.federation.tools.request import decode_authorization_header
-from mediagoblin.federation.tools.forms import WTFormData
+from mediagoblin.oauth.forms import AuthorizeForm
+from mediagoblin.oauth.oauth import GMGRequestValidator, GMGRequest
+from mediagoblin.oauth.tools.request import decode_authorization_header
+from mediagoblin.oauth.tools.forms import WTFormData
from mediagoblin.db.models import NonceTimestamp, Client, RequestToken
# possible client types