diff options
| author | Andy Doan <andy.doan@linaro.org> | 2014-09-03 19:10:17 +0000 |
|---|---|---|
| committer | Linaro Code Review <review@review.linaro.org> | 2014-09-03 19:10:17 +0000 |
| commit | a3fbd4afc81d963bfa67eba585e35ec98985591d (patch) | |
| tree | 41f4862186de8b982e76483c9ed09ab7a1df9989 | |
| parent | 8d6c788410d6d346d827726ceed52fd1484ed108 (diff) | |
| parent | d70e5e52b98766c4df6b931f37686819956d7baa (diff) | |
Merge "API: refactor "uploads" into more common "api" module"
| -rw-r--r-- | license_protected_downloads/api/__init__.py | 0 | ||||
| -rw-r--r-- | license_protected_downloads/api/v1.py (renamed from license_protected_downloads/uploads.py) | 0 | ||||
| -rw-r--r-- | license_protected_downloads/views.py | 3 | ||||
| -rw-r--r-- | urls.py | 4 |
4 files changed, 4 insertions, 3 deletions
diff --git a/license_protected_downloads/api/__init__.py b/license_protected_downloads/api/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/license_protected_downloads/api/__init__.py diff --git a/license_protected_downloads/uploads.py b/license_protected_downloads/api/v1.py index 5cc6fa1..5cc6fa1 100644 --- a/license_protected_downloads/uploads.py +++ b/license_protected_downloads/api/v1.py diff --git a/license_protected_downloads/views.py b/license_protected_downloads/views.py index abdd4ab..99f0017 100644 --- a/license_protected_downloads/views.py +++ b/license_protected_downloads/views.py @@ -28,12 +28,13 @@ from models import License, APIKeyStore import importlib group_auth_modules = [importlib.import_module(m) for m in settings.GROUP_AUTH_MODULES] from BeautifulSoup import BeautifulSoup -from uploads import file_server_post import config from common import safe_path_join from group_auth_common import GroupAuthError import xml.dom.minidom as dom +from license_protected_downloads.api.v1 import file_server_post + LINARO_INCLUDE_FILE_RE = re.compile( r'<linaro:include file="(?P<file_name>.*)"[ ]*/>') @@ -53,10 +53,10 @@ urlpatterns = patterns('', 'license_protected_downloads.views.get_license_api'), url(r'^api/request_key$', - 'license_protected_downloads.uploads.api_request_key'), + 'license_protected_downloads.api.v1.api_request_key'), url(r'^api/delete_key$', - 'license_protected_downloads.uploads.api_delete_key'), + 'license_protected_downloads.api.v1.api_delete_key'), # Catch-all. We always return a file (or try to) if it exists. # This handler does that. |