0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cleanup imports and syntax warnings

Browse source
This commit is contained in:
j 2011-01-01 17:14:42 +05:30
commit 2d5f924891
46 changed files with 452 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pandora/api/actions.py
View file

@ -18,7 +18,7 @@ def autodiscover():
import_module('%s.views'%app)
except:
if module_has_submodule(mod, 'views'):
raise
raise
def trim(docstring):
@ -46,8 +46,11 @@ def trim(docstring):
# Return a single string:
return '\n'.join(trimmed)
class ApiActions(dict):
def __init__(self):
def api(request):
'''
returns list of all known api action
@ -56,7 +59,8 @@ class ApiActions(dict):
'''
actions = self.keys()
actions.sort()
return render_to_json_response(json_response({'actions': actions}))
response = json_response({'actions': actions})
return render_to_json_response(response)
self['api'] = api
def apidoc(request):

47
pandora/api/views.py
View file

@ -1,54 +1,32 @@
# -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4
from __future__ import division
import os.path
import re
from datetime import datetime
from urllib2 import unquote
import mimetypes
from django import forms
from django.core.paginator import Paginator
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User
from django.db.models import Q, Avg, Count, Sum
from django.http import HttpResponse, Http404
from django.shortcuts import render_to_response, get_object_or_404, get_list_or_404, redirect
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.conf import settings
from ox.utils import json
from ox.django.decorators import login_required_json
from ox.django.shortcuts import render_to_json_response, get_object_or_404_json, json_response
from ox.django.http import HttpFileResponse
import ox
import models
from ox.django.shortcuts import render_to_json_response, json_response
from pandora.user.models import get_user_json
from pandora.archive.models import File
from pandora.archive import extract
from actions import actions
def api(request):
if request.META['REQUEST_METHOD'] == "OPTIONS":
response = HttpResponse('')
response = render_to_json_response({'status': {'code': 200, 'text': 'use POST'}})
response = render_to_json_response({'status': {'code': 200,
'text': 'use POST'}})
response['Access-Control-Allow-Origin'] = '*'
return response
if not 'action' in request.POST:
methods = actions.keys()
api = []
for f in sorted(methods):
api.append({
'name': f,
'doc': actions.doc(f).replace('\n', '<br>\n')
})
api.append({'name': f,
'doc': actions.doc(f).replace('\n', '<br>\n')})
context = RequestContext(request, {'api': api,
'sitename': settings.SITENAME,})
'sitename': settings.SITENAME})
return render_to_response('api.html', context)
function = request.POST['action']
#FIXME: possible to do this in f
@ -63,6 +41,7 @@ def api(request):
response['Access-Control-Allow-Origin'] = '*'
return response
def hello(request):
'''
return {'status': {'code': int, 'text': string},
@ -73,15 +52,17 @@ def hello(request):
if request.user.is_authenticated():
response['data']['user'] = get_user_json(request.user)
else:
response['data']['user'] = {'name': 'Guest', 'group': 'guest', 'preferences': {}}
response['data']['user'] = {'name': 'Guest',
'group': 'guest',
'preferences': {}}
return render_to_json_response(response)
actions.register(hello)
def error(request):
'''
this action is used to test api error codes, it should return a 503 error
this action is used to test api error codes, it should return a 503 error
'''
success = error_is_success
return render_to_json_response({})
actions.register(error)