--- a/src/ldt/ldt/auth/__init__.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/auth/__init__.py Fri Sep 02 14:26:34 2011 +0200
@@ -1,6 +1,6 @@
-def checkAccess(user, obj):
- check_meth = getattr(obj, 'checkAccess', False)
+def check_access(user, obj):
+ check_meth = getattr(obj, 'check_access', False)
if check_meth:
return check_meth(user)
else:
--- a/src/ldt/ldt/ldt_utils/admin.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/admin.py Fri Sep 02 14:26:34 2011 +0200
@@ -23,7 +23,7 @@
# fi = None
fi = FileImport(filetoprocess, videoPath, flatten)
try:
- fi.processFile()
+ fi.process_file()
args = {'message': "File imported"}
except FileImportError:
non_field_errors = form.non_field_errors()
--- a/src/ldt/ldt/ldt_utils/fileimport.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/fileimport.py Fri Sep 02 14:26:34 2011 +0200
@@ -45,7 +45,7 @@
- def processIri(self):
+ def process_iri(self):
# for just import a file ldt and get the title for every media
if 'http' in self.src:
#url = urllib.urlopen(self.src)
@@ -138,7 +138,7 @@
@transaction.commit_on_success
- def saveContent(self):
+ def save_content(self):
defaults_media = {
@@ -173,8 +173,8 @@
self.content = content
def process(self):
- self.processIri()
- self.saveContent()
+ self.process_iri()
+ self.save_content()
class BaseFileImport(object):
@@ -238,24 +238,24 @@
def __init__(self, filepath, videopath, flatten):
BaseFileImport.__init__(self, filepath, videopath)
- self.__checkExistingMedia = False
+ self.__check_existing_media = False
self.__flatten = flatten
- def checkExistingMedia(): #@NoSelf
+ def check_existing_media(): #@NoSelf
doc = """Docstring""" #@UnusedVariable
def fget(self):
- return self.__checkExistingMedia
+ return self.__check_existing_media
def fset(self, value):
- self.__checkExistingMedia = value
+ self.__check_existing_media = value
def fdel(self):
- del self.__checkExistingMedia
+ del self.__check_existing_media
return locals()
- checkExistingMedia = property(**checkExistingMedia())
+ check_existing_media = property(**check_existing_media())
def flatten(): #@NoSelf
doc = """Docstring""" #@UnusedVariable
@@ -272,7 +272,7 @@
return locals()
flatten = property(**flatten())
- def processLdt(self, ldtpath=None):
+ def process_ldt(self, ldtpath=None):
# list iri
# see if there is some comments
@@ -306,7 +306,7 @@
# get iri file's id from file ldt
#id = medianode.attributes['id'].value
id = medianode.attrib['id']
- if self.checkExistingMedia:
+ if self.check_existing_media:
try:
Content.objects.get(iri_id=id)
do_pass = True
@@ -352,17 +352,17 @@
# move iri file to the proper place
#return list of iriInfo
- def processFile(self):
+ def process_file(self):
if self.filepath.name.endswith(".ldt"):
- self.processLdt()
+ self.process_ldt()
elif self.filepath.name.endswith(".zip"):
- self.processZip()
+ self.process_zip()
else:
raise FileImportError("Bad file type")
- def processZip(self):
- # """ extraire .zip, pass to method processLdt"""
+ def process_zip(self):
+ # """ extraire .zip, pass to method process_ldt"""
# create temp directory
self.__tempdir = tempfile.mkdtemp()
openfiles = []
@@ -383,7 +383,7 @@
if(os.path.isdir(entryPath)):
foldersToProcess.append(entryPath)
elif fnmatch.fnmatch(entry, "*.ldt"):
- ldtid = self.processLdt(entryPath)
+ ldtid = self.process_ldt(entryPath)
processedids.append(ldtid)
elif fnmatch.fnmatch(entry, "*.flv"):
flvfiles.append(entryPath)
@@ -399,8 +399,8 @@
# delete directory
return processedids
- # def processFileLdt(self):
+ # def process_file_ldt(self):
# processedids = []
- # ldtid = self.processLdt(self.filepath)
+ # ldtid = self.process_ldt(self.filepath)
# processedids.append(ldtid)
# return processedids
--- a/src/ldt/ldt/ldt_utils/models.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/models.py Fri Sep 02 14:26:34 2011 +0200
@@ -376,7 +376,7 @@
project.save()
return project
- def checkAccess(self, user):
+ def check_access(self, user):
if (user and user.is_staff) or self.state == 2:
return True
else:
--- a/src/ldt/ldt/ldt_utils/projectserializer.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/projectserializer.py Fri Sep 02 14:26:34 2011 +0200
@@ -399,7 +399,7 @@
return res
- def getAnnotations(self, first_cutting=True):
+ def get_annotations(self, first_cutting=True):
if not self.parsed:
self.__parse_ldt()
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Fri Sep 02 14:26:34 2011 +0200
@@ -42,7 +42,7 @@
'{% trans "File uploaded" %}',
'{% trans "Please wait, the upload is not finished yet" %}',
'{% trans "Cancel upload" %}',
- "{% url ldt.ldt_utils.views.removetempfile %}",
+ "{% url ldt.ldt_utils.views.remove_temp_file %}",
"{% url ldt.ldt_utils.views.get_duration %}");
});
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Fri Sep 02 14:26:34 2011 +0200
@@ -6,8 +6,8 @@
{{block.super}}
<script type="text/javascript">
-var content_filter_url = "{% url ldt.ldt_utils.views.contentsfilter filter='__FILTER__' %}";
-var project_filter_url = "{% url ldt.ldt_utils.views.projectsfilter filter='__FILTER__' is_owner='false' status='0' id_group='__ID_GROUP__' %}";
+var content_filter_url = "{% url ldt.ldt_utils.views.contents_filter filter='__FILTER__' %}";
+var project_filter_url = "{% url ldt.ldt_utils.views.projects_filter filter='__FILTER__' is_owner='false' status='0' id_group='__ID_GROUP__' %}";
var publish_project_url = "{% url ldt.ldt_utils.views.publish '__PROJECT_ID__' 'false' %}";
var unpublish_project_url = "{% url ldt.ldt_utils.views.unpublish '__PROJECT_ID__' 'false' %}";
var get_group_projects_url = "{% url ldt.ldt_utils.views.get_group_projects %}";
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/ldt_list.html Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/ldt_list.html Fri Sep 02 14:26:34 2011 +0200
@@ -11,7 +11,7 @@
{{block.super}}
<script type="text/javascript">
-searchprojectfilterurl = "{% url ldt.ldt_utils.views.projectsfilter filter='__FILTER__' is_owner='true' status='0' %}";
+searchprojectfilterurl = "{% url ldt.ldt_utils.views.projects_filter filter='__FILTER__' is_owner='true' status='0' %}";
publishprojecturl = "{% url ldt.ldt_utils.views.publish '__PROJECT_ID__' 'false' %}";
unpublishprojecturl = "{% url ldt.ldt_utils.views.unpublish '__PROJECT_ID__' 'false' %}";
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html Fri Sep 02 14:26:34 2011 +0200
@@ -11,8 +11,8 @@
{{block.super}}
<script type="text/javascript">
-var content_filter_url = "{% url ldt.ldt_utils.views.contentsfilter filter='__FILTER__' %}";
-var project_filter_url = "{% url ldt.ldt_utils.views.projectsfilter filter='__FILTER__' is_owner='false' status='2' %}";
+var content_filter_url = "{% url ldt.ldt_utils.views.contents_filter filter='__FILTER__' %}";
+var project_filter_url = "{% url ldt.ldt_utils.views.projects_filter filter='__FILTER__' is_owner='false' status='2' %}";
var publish_project_url = "{% url ldt.ldt_utils.views.publish '__PROJECT_ID__' 'false' %}";
var unpublish_project_url = "{% url ldt.ldt_utils.views.unpublish '__PROJECT_ID__' 'false' %}";
@@ -54,7 +54,7 @@
</div>
<div class="span-12 last projectscontentsdiv" id="autre">
<form method="post" id="my_form"
- action="{% url ldt.ldt_utils.views.searchIndex %}"
+ action="{% url ldt.ldt_utils.views.search_index %}"
accept-charset="utf-8">
{% csrf_token %}
<table>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_form.html Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_form.html Fri Sep 02 14:26:34 2011 +0200
@@ -20,8 +20,8 @@
{% block content %}
<form method="post" id="my_form"
- {% comment %}action="{{WEB_URL}}{% url ldt.ldt_utils.views.searchIndex %}"{% endcomment %}
- action="{% url ldt.ldt_utils.views.searchIndex %}"
+ {% comment %}action="{{WEB_URL}}{% url ldt.ldt_utils.views.search_index %}"{% endcomment %}
+ action="{% url ldt.ldt_utils.views.search_index %}"
accept-charset="utf-8">
{% csrf_token %}
<table>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html Fri Sep 02 14:26:34 2011 +0200
@@ -11,8 +11,8 @@
{{block.super}}
<script type="text/javascript">
-var content_filter_url = "{% url ldt.ldt_utils.views.contentsfilter filter='__FILTER__' %}";
-var project_filter_url = "{% url ldt.ldt_utils.views.projectsfilter filter='__FILTER__' is_owner='true' status='0' %}";
+var content_filter_url = "{% url ldt.ldt_utils.views.contents_filter filter='__FILTER__' %}";
+var project_filter_url = "{% url ldt.ldt_utils.views.projects_filter filter='__FILTER__' is_owner='true' status='0' %}";
var publish_project_url = "{% url ldt.ldt_utils.views.publish '__PROJECT_ID__' 'false' %}";
var unpublish_project_url = "{% url ldt.ldt_utils.views.unpublish '__PROJECT_ID__' 'false' %}";
--- a/src/ldt/ldt/ldt_utils/tests.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/tests.py Fri Sep 02 14:26:34 2011 +0200
@@ -66,7 +66,7 @@
self.project.contents.add(self.cont1, self.cont2)
f = tempfile.TemporaryFile(mode='r+')
- doc = self.LU.generateLdt(Content.objects.all())
+ doc = self.LU.generate_ldt(Content.objects.all())
doc.write(f, pretty_print=True)
f.seek(0)
ldoc = lxml.etree.parse(f)
@@ -84,7 +84,7 @@
self.cont4.save()
self.project.contents.add(self.cont3, self.cont4)
- ldoc = self.LU.generateInit(None, None)
+ ldoc = self.LU.generate_init(None, None)
self.assertEqual(ldoc.xpath("/iri/files/init")[0].tag, "init")
self.assertEqual(ldoc.xpath("/iri/files/library")[0].tag, "library")
self.assertEqual(ldoc.xpath("/iri/files/init/file")[0].get("video"), settings.STREAM_URL)
--- a/src/ldt/ldt/ldt_utils/urls.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/urls.py Fri Sep 02 14:26:34 2011 +0200
@@ -6,16 +6,16 @@
# admin.autodiscover()
urlpatterns = patterns('ldt.ldt_utils',
- url(r'^searchInit/(?P<field>.*)/(?P<query>.*)$', 'views.searchInit'),
- url(r'^searchForm/$', 'views.searchForm'),
+ url(r'^searchInit/(?P<field>.*)/(?P<query>.*)$', 'views.search_init'),
+ url(r'^searchForm/$', 'views.search_form'),
url(r'^import_rs/$', 'views.import_rs'),
url(r'^published/$', 'views.published_project'),
url(r'^groups/$', 'views.groups'),
url(r'^get_group_projects/$', 'views.get_group_projects'),
- url(r'^search/$', 'views.searchIndex'),
- url(r'^search/(?P<field>.*)/(?P<query>.*)$', 'views.searchIndexGet'),
- url(r'^searchLdt/(?P<field>.*)/(?P<query>.*)$', 'views.searchLdt'),
- url(r'^searchSeg/(?P<field>.*)/(?P<query>.*)$', 'views.searchSegments'),
+ url(r'^search/$', 'views.search_index'),
+ url(r'^search/(?P<field>.*)/(?P<query>.*)$', 'views.search_index_get'),
+ url(r'^searchLdt/(?P<field>.*)/(?P<query>.*)$', 'views.search_ldt'),
+ url(r'^searchSeg/(?P<field>.*)/(?P<query>.*)$', 'views.search_segments'),
url(r'^index/(?P<url>.*)$', 'views.index'),
url(r'^init/(?P<method>.*)/(?P<url>.*)$', 'views.init', name='ldt_init'),
url(r'^ldt/(?P<url>.*)$', 'views.ldt'),
@@ -27,9 +27,9 @@
url(r'^cljson/externalid/(?P<id>.*)$', 'views.project_json_externalid'),
url(r'^rdf/id/(?P<ldt_id>.*)$', 'views.project_annotations_rdf'),
url(r'^/?$', "views.workspace", name="root-view"),
- url(r'^filterprojects/_(?P<filter>[\w\%\_\-\+]*?)/(?P<is_owner>true|false)/(?P<status>\d)$', "views.projectsfilter",),
- url(r'^filterprojects/_(?P<filter>[\w\%\_\-\+]*?)/(?P<is_owner>true|false)/(?P<status>\d)/(?P<id_group>.*)$', "views.projectsfilter",),
- url(r'^filtercontents/_(?P<filter>[\w\%\_\-\+]*?)/$', "views.contentsfilter",),
+ url(r'^filterprojects/_(?P<filter>[\w\%\_\-\+]*?)/(?P<is_owner>true|false)/(?P<status>\d)$', "views.projects_filter",),
+ url(r'^filterprojects/_(?P<filter>[\w\%\_\-\+]*?)/(?P<is_owner>true|false)/(?P<status>\d)/(?P<id_group>.*)$', "views.projects_filter",),
+ url(r'^filtercontents/_(?P<filter>[\w\%\_\-\+]*?)/$', "views.contents_filter",),
(r'^embedpopup/?$', "views.popup_embed"),
url(r'^segment/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.index_segment'),
url(r'^segmentInit/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.init_segment'),
@@ -51,14 +51,14 @@
url(r'^space/ldt/indexproject/(?P<id>.*)$', 'views.index_project', name='index_project'),
url(r'^space/ldt/indexprojectfull/(?P<id>.*)$', 'views.index_project', {'full': True}, name='index_project_full'),
url(r'^space/ldt/init/(?P<method>.*)/(?P<url>.+)$', 'views.init', name='space_ldt_init'),
- url(r'^space/ldt/project/(?P<id>.*)$', 'views.ldtProject'),
+ url(r'^space/ldt/project/(?P<id>.*)$', 'views.ldt_project'),
url(r'^space/ldt/create/$', 'views.create_ldt_view'),
url(r'^space/ldt/created_done/$', 'views.created_ldt'),
- url(r'^space/ldt/save/$', 'views.save_ldtProject'),
+ url(r'^space/ldt/save/$', 'views.save_ldt_project'),
url(r'^space/ldt/publish/(?P<id>[\w-]*)(?:/(?P<redirect>true|false))?$', 'views.publish'),
url(r'^space/ldt/unpublish/(?P<id>[\w-]*)(?:/(?P<redirect>true|false))?$', 'views.unpublish'),
url(r'^space/upload/$', 'views.upload'),
- url(r'^space/removetempfile/$', 'views.removetempfile'),
+ url(r'^space/removetempfile/$', 'views.remove_temp_file'),
url(r'^space/getduration/$', 'views.get_duration'),
)
--- a/src/ldt/ldt/ldt_utils/utils.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/utils.py Fri Sep 02 14:26:34 2011 +0200
@@ -50,12 +50,12 @@
indexSearcher.close()
return res
- def queryAll(self, query):
+ def query_all(self, query):
return self.query("all", query)
class LdtUtils(object):
- def generateLdt(self, contentList, title=u"", author=u"IRI Web", web_url=u"", startSegment=None, projects=None):
+ def generate_ldt(self, contentList, title=u"", author=u"IRI Web", web_url=u"", startSegment=None, projects=None):
iri = lxml.etree.Element(u'iri')
doc = lxml.etree.ElementTree(iri)
@@ -143,7 +143,7 @@
return doc
- def generateInit(self, url, method, search=None):
+ def generate_init(self, url, method, search=None):
iri = lxml.etree.Element('iri')
--- a/src/ldt/ldt/ldt_utils/views.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/views.py Fri Sep 02 14:26:34 2011 +0200
@@ -143,11 +143,11 @@
if stream_mode == 'radio':
player_height = 1
- if not ldt_auth.checkAccess(request.user, project):
+ if not ldt_auth.check_access(request.user, project):
return HttpResponseForbidden(_("You can not access this project"))
ps = ProjectSerializer(project, from_contents=False, from_display=True)
- annotations = ps.getAnnotations(first_cutting=True)
+ annotations = ps.get_annotations(first_cutting=True)
rend_dict = {'json_url':json_url, 'player_id':player_id, 'annotations':annotations, 'ldt_id': ldt_id, 'stream_mode': stream_mode, 'player_width': player_width, 'player_height': player_height}
@@ -164,7 +164,7 @@
@login_required
-def projectsfilter(request, filter, is_owner=False, status=0, id_group=None):
+def projects_filter(request, filter, is_owner=False, status=0, id_group=None):
is_owner = boolean_convert(is_owner)
status = int(status)
@@ -212,7 +212,7 @@
@login_required
-def contentsfilter(request, filter):
+def contents_filter(request, filter):
if filter and len(filter) > 0 and filter[0] == '_':
filter = filter[1:]
@@ -226,11 +226,11 @@
context_instance=RequestContext(request))
-def searchForm(request):
+def search_form(request):
form = SearchForm()
return render_to_response('ldt/ldt_utils/search_form.html', {'form': form} , context_instance=RequestContext(request))
-def searchIndex(request):
+def search_index(request):
sform = SearchForm(request.POST)
if sform.is_valid():
@@ -244,7 +244,7 @@
else:
ldt_pres = False
- url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.searchInit", args=[field, queryStr])
+ url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.search_init", args=[field, queryStr])
# For the moment, we always display the results in a regular LDT template
if ldt_pres :
@@ -256,24 +256,24 @@
resp.write("<html><head></head><body>Error : No result</body></html>");
return resp
-def searchIndexGet(request, field, query):
+def search_index_get(request, field, query):
language_code = request.LANGUAGE_CODE[:2]
- url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.searchInit", args=[field, query])
+ url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.search_init", args=[field, query])
return render_to_response('ldt/ldt_utils/init_ldt.html', {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': url}, context_instance=RequestContext(request))
-def searchInit(request, field, query):
+def search_init(request, field, query):
ldtgen = LdtUtils()
- doc = ldtgen.generateInit([field, query], 'ldt.ldt_utils.views.searchLdt', 'ldt.ldt_utils.views.searchSegments')
+ doc = ldtgen.generate_init([field, query], 'ldt.ldt_utils.views.search_ldt', 'ldt.ldt_utils.views.search_segments')
resp = HttpResponse(mimetype="text/xml;charset=utf-8")
resp.write(lxml.etree.tostring(doc, pretty_print=True, encoding="utf-8"))
return resp
-def searchLdt(request, field, query, edition=None):
+def search_ldt(request, field, query, edition=None):
contentList = []
resp = HttpResponse(mimetype="text/xml")
@@ -301,15 +301,15 @@
ldtgen = LdtUtils()
- # generateLdt(contentList, title=u"", author=u"IRI Web", web_url=u"", startSegment=None, projects=None):
- doc = ldtgen.generateLdt(contentList, title=u"Recherche : " + queryStr, projects=projectList)
+ # generate_ldt(contentList, title=u"", author=u"IRI Web", web_url=u"", startSegment=None, projects=None):
+ doc = ldtgen.generate_ldt(contentList, title=u"Recherche : " + queryStr, projects=projectList)
doc.write(resp, pretty_print=True)
return resp
-def searchSegments(request, field, query, edition=None):
+def search_segments(request, field, query, edition=None):
if query and len(query) > 0:
searcher = LdtSearch()
@@ -397,7 +397,7 @@
def init_segment(request, project_id, content_id, ensemble_id, cutting_id, segment_id):
ldtgen = LdtUtils()
- doc = ldtgen.generateInit([project_id, content_id, ensemble_id, cutting_id, segment_id], 'ldt.ldt_utils.views.ldt_segment', 'ldt.ldt_utils.views.highlight_segment')
+ doc = ldtgen.generate_init([project_id, content_id, ensemble_id, cutting_id, segment_id], 'ldt.ldt_utils.views.ldt_segment', 'ldt.ldt_utils.views.highlight_segment')
return HttpResponse(lxml.etree.tostring(lxml.etree.ElementTree(doc), pretty_print=True), mimetype="text/xml;charset=utf-8")
@@ -469,7 +469,7 @@
'idsegment' : segment_id
}
- doc = ldtgen.generateLdt(content_list, "segment : ", author=username, startSegment=start_segment)
+ doc = ldtgen.generate_ldt(content_list, "segment : ", author=username, startSegment=start_segment)
doc.write(resp, pretty_print = ('DEBUG' in dir(settings) and settings.DEBUG))
@@ -479,8 +479,8 @@
def index_project(request, id, full= False):
- urlStr = settings.WEB_URL + reverse("space_ldt_init", args=['ldtProject', id])
- posturl = settings.WEB_URL + reverse("ldt.ldt_utils.views.save_ldtProject")
+ urlStr = settings.WEB_URL + reverse("space_ldt_init", args=['ldt_project', id])
+ posturl = settings.WEB_URL + reverse("ldt.ldt_utils.views.save_ldt_project")
language_code = request.LANGUAGE_CODE[:2]
ldt = get_object_or_404(Project, ldt_id=id)
@@ -500,7 +500,7 @@
def init(request, method, url):
ldtgen = LdtUtils()
- doc = ldtgen.generateInit([url], 'ldt.ldt_utils.views.' + method, None)
+ doc = ldtgen.generate_init([url], 'ldt.ldt_utils.views.' + method, None)
resp = HttpResponse(mimetype="text/xml")
resp['Cache-Control'] = 'no-cache, must-revalidate'
@@ -509,7 +509,7 @@
resp.write(lxml.etree.tostring(doc, pretty_print=True, xml_declaration=True, encoding="utf-8"))
return resp
-def ldtProject(request, id):
+def ldt_project(request, id):
resp = HttpResponse(mimetype="text/xml")
resp['Cache-Control'] = 'no-cache, must-revalidate'
resp['Pragma'] = 'no-cache'
@@ -536,7 +536,7 @@
def project_json(request, project, serialize_contents=True):
- if not ldt_auth.checkAccess(request.user, project):
+ if not ldt_auth.check_access(request.user, project):
return HttpResponseForbidden(_("You can not access this project"))
mimetype = request.REQUEST.get("mimetype")
@@ -582,7 +582,7 @@
project = Project.objects.get(ldt_id=ldt_id); #@UndefinedVariable
- if not ldt_auth.checkAccess(request.user, project):
+ if not ldt_auth.check_access(request.user, project):
return HttpResponseForbidden(_("You can not access this project"))
mimetype = request.REQUEST.get("mimetype")
@@ -597,7 +597,7 @@
resp['Pragma'] = 'no-cache'
ps = ProjectSerializer(project, from_contents=False, from_display=True)
- annotations = ps.getAnnotations(first_cutting=True)
+ annotations = ps.get_annotations(first_cutting=True)
rdf_ns = u"http://www.w3.org/1999/02/22-rdf-syntax-ns#"
dc_ns = u"http://purl.org/dc/elements/1.1/"
@@ -631,7 +631,7 @@
return resp
-def save_ldtProject(request):
+def save_ldt_project(request):
if request.method == "POST":
ldt = request.POST['ldt']
id = request.POST['id']
@@ -707,7 +707,7 @@
contentList = Content.objects.filter(iri_id=url) #@UndefinedVariable
ldtgen = LdtUtils()
- doc = ldtgen.generateLdt(contentList, title=contentList[0].title, startSegment=startSegment)
+ doc = ldtgen.generate_ldt(contentList, title=contentList[0].title, startSegment=startSegment)
doc.write(resp, pretty_print=True)
return resp
@@ -1080,7 +1080,7 @@
else:
return HttpResponse("notok", mimetype="text/plain")
-def removetempfile(request):
+def remove_temp_file(request):
# The filename arrives with a GET var.
file_path = os.path.join(settings.STREAM_PATH, "tmp/" + request.COOKIES[settings.SESSION_COOKIE_NAME] + "/", ldt_utils_path.sanitize_filename(request.GET["filename"]))
if os.path.exists(file_path):
--- a/src/ldt/ldt/templates/ldt/ldt_base.html Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/templates/ldt/ldt_base.html Fri Sep 02 14:26:34 2011 +0200
@@ -102,7 +102,7 @@
{% url ldt.ldt_utils.views.list_ldt as space_url %}
{% url ldt.ldt_utils.views.list_content as content_url %}
{% url ldt.user.views.profile as profile_url %}
- {% url ldt.ldt_utils.views.searchForm as search_url %}
+ {% url ldt.ldt_utils.views.search_form as search_url %}
<ul class="tabs">
<li class='{% active request "active" workspace_url %}'><a href="{{ workspace_url }}" >{% trans "home" %}</a></li>
<li class='{% active request "active" groups_url %}'><a href="{{ groups_url }}" >{% trans "My groups" %}</a></li>
@@ -116,7 +116,7 @@
</div>
{% if user.is_authenticated %}
<div class="block span-4 last">
- <form method="post" id="quick_search_form" action="{% url ldt.ldt_utils.views.searchIndex %}" accept-charset="utf-8">
+ <form method="post" id="quick_search_form" action="{% url ldt.ldt_utils.views.search_index %}" accept-charset="utf-8">
<input type="text" name="search" id="id_search" size="16"/>
<input type='hidden' name='field' value='all' />
<input type="submit" class="quick_search_submit" value="" />{% csrf_token %}</form>
--- a/src/ldt/ldt/text/utils.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/text/utils.py Fri Sep 02 14:26:34 2011 +0200
@@ -51,7 +51,7 @@
indexSearcher.close()
return res
- def queryAll(self, query):
+ def query_all(self, query):
return self.query("all", query)
--- a/src/ldt/ldt/user/templates/ldt/user/login_form.html Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/user/templates/ldt/user/login_form.html Fri Sep 02 14:26:34 2011 +0200
@@ -4,7 +4,7 @@
{{block.super}}
<script language="javascript">
- var url_login_ajax='{{WEB_URL}}{% url ldt.user.views.loginAjax %}';
+ var url_login_ajax='{{WEB_URL}}{% url ldt.user.views.login_ajax %}';
{% if reload %}
var reload=true;
{% else %}
--- a/src/ldt/ldt/user/templatetags/logintag.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/user/templatetags/logintag.py Fri Sep 02 14:26:34 2011 +0200
@@ -2,7 +2,7 @@
register = template.Library()
-def loginAjax(user, reload=None):
+def login_ajax(user, reload=None):
return {'user': user, 'reload': reload}
-register.inclusion_tag('ldt/user/login_form.html')(loginAjax)
+register.inclusion_tag('ldt/user/login_form.html')(login_ajax)
--- a/src/ldt/ldt/user/urls.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/user/urls.py Fri Sep 02 14:26:34 2011 +0200
@@ -1,7 +1,7 @@
from django.conf.urls.defaults import patterns, url
urlpatterns = patterns('',
- url(r'^loginAjax/$', 'ldt.user.views.loginAjax'),
+ url(r'^loginAjax/$', 'ldt.user.views.login_ajax'),
url(r'^profile/$', 'ldt.user.views.profile'),
url(r'^language/$', 'ldt.user.views.language'),
url(r'^password/$', 'ldt.user.views.password'),
@@ -9,10 +9,10 @@
# url(r'^space/ldt/$', 'ldt.ldt_utils.views.list_ldt'),
# url(r'^space/ldt/indexproject/(?P<id>.*)$', 'ldt.ldt_utils.views.index_project'),
# url(r'^space/ldt/init/(?P<method>.*)/(?P<url>.*)$', 'ldt.ldt_utils.views.init'),
-# url(r'^space/ldt/project/(?P<id>.*)$', 'ldt.ldt_utils.views.ldtProject'),
+# url(r'^space/ldt/project/(?P<id>.*)$', 'ldt.ldt_utils.views.ldt_project'),
# url(r'^space/ldt/create/$', 'ldt.ldt_utils.views.create_ldt_view'),
# url(r'^space/ldt/created_done/$', 'ldt.ldt_utils.views.created_ldt'),
-# url(r'^space/ldt/save/$', 'ldt.ldt_utils.views.save_ldtProject'),
+# url(r'^space/ldt/save/$', 'ldt.ldt_utils.views.save_ldt_project'),
# url(r'^space/ldt/publish/(?P<id>.*)$', 'ldt.ldt_utils.views.publish'),
# url(r'^space/ldt/unpublish/(?P<id>.*)$', 'ldt.ldt_utils.views.unpublish'),
)
--- a/src/ldt/ldt/user/views.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/ldt/user/views.py Fri Sep 02 14:26:34 2011 +0200
@@ -30,7 +30,7 @@
#return HttpResponseRedirect(settings.LOGOUT_URL)
-def loginAjax(request, loginstate_template_name='ldt/user/login_form.html'):
+def login_ajax(request, loginstate_template_name='ldt/user/login_form.html'):
if request.method == "POST":
username = request.POST["username"]
password = request.POST["password"]
--- a/src/ldt/setup.py Fri Sep 02 11:55:46 2011 +0200
+++ b/src/ldt/setup.py Fri Sep 02 14:26:34 2011 +0200
@@ -16,7 +16,7 @@
version = version_variables['__version__']
-def fullsplit(path, result=None):
+def full_split(path, result=None):
"""
Split a pathname into components (the opposite of os.path.join) in a
platform-neutral way.
@@ -28,7 +28,7 @@
return [tail] + result
if head == path:
return result
- return fullsplit(head, [tail] + result)
+ return full_split(head, [tail] + result)
packages, data_files, path_processed = [], {}, []
@@ -42,10 +42,10 @@
for i, dirname in enumerate(dirnames):
if dirname.startswith('.'): del dirnames[i]
if '__init__.py' in filenames:
- packages.append('.'.join(fullsplit(dirpath)))
+ packages.append('.'.join(full_split(dirpath)))
else:
new_data_files = []
- base_path_list = fullsplit(dirpath)[:-1]
+ base_path_list = full_split(dirpath)[:-1]
base_path = "/".join(base_path_list) + "/"
key = '.'.join(base_path_list)
for ldirpath, ldirnames, lfilenames in os.walk(dirpath):