matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PEP8 Cleanups

Browse Source
This commit is contained in:
Roberto Rosario
2011-07-06 03:22:53 -04:00
parent 2739ad9027
commit 83de8c7b49
6 changed files with 35 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/documents/conf/settings.py
View File

@@ -26,14 +26,6 @@ register_settings(
namespace=u'documents',
module=u'documents.conf.settings',
settings=[
# Upload
#{'name': u'USE_STAGING_DIRECTORY', 'global_name': u'DOCUMENTS_USE_STAGING_DIRECTORY', 'default': False},
#{'name': u'STAGING_DIRECTORY', 'global_name': u'DOCUMENTS_STAGING_DIRECTORY', 'default': u'/tmp/mayan/staging', 'exists': True},
#{'name': u'PER_USER_STAGING_DIRECTORY', 'global_name': u'DOCUMENTS_PER_USER_STAGING_DIRECTORY', 'default': False},
#{'name': u'USER_STAGING_DIRECTORY_ROOT', 'global_name': u'DOCUMENTS_USER_STAGING_DIRECTORY_ROOT', 'default': u'/tmp/mayan/staging/users', 'exists': True},
#{'name': u'USER_STAGING_DIRECTORY_EXPRESSION', 'global_name': u'DOCUMENTS_USER_STAGING_DIRECTORY_EXPRESSION', 'default': u'user.username'},
#{'name': u'DELETE_STAGING_FILE_AFTER_UPLOAD', 'global_name': u'DOCUMENTS_DELETE_STAGING_FILE_AFTER_UPLOAD', 'default': False},
#{'name': u'STAGING_FILES_PREVIEW_SIZE', 'global_name': u'DOCUMENTS_STAGING_FILES_PREVIEW_SIZE', 'default': u'640x480'},
# Saving
{'name': u'CHECKSUM_FUNCTION', 'global_name': u'DOCUMENTS_CHECKSUM_FUNCTION', 'default': default_checksum},
{'name': u'UUID_FUNCTION', 'global_name': u'DOCUMENTS_UUID_FUNCTION', 'default': default_uuid},

5
apps/sources/__init__.py
View File

@@ -1,8 +1,6 @@
from django.utils.translation import ugettext_lazy as _
from django.core.urlresolvers import reverse
from django.conf import settings
from navigation.api import register_links, register_top_menu, \
from navigation.api import register_links, \
register_model_list_columns, register_multi_item_links, \
register_sidebar_template
@@ -12,4 +10,3 @@ staging_file_preview = {'text': _(u'preview'), 'class': 'fancybox-noscaling', 'v
staging_file_delete = {'text': _(u'delete'), 'view': 'staging_file_delete', 'args': ['source.source_type', 'source.pk', 'object.id'], 'famfam': 'delete'}
register_links(StagingFile, [staging_file_preview, staging_file_delete])

8
apps/sources/forms.py
View File

@@ -1,14 +1,6 @@
from django import forms
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext
from django.core.urlresolvers import reverse
from django.utils.safestring import mark_safe
from django.conf import settings
from common.forms import DetailForm
from common.literals import PAGE_SIZE_CHOICES, PAGE_ORIENTATION_CHOICES
from common.conf.settings import DEFAULT_PAPER_SIZE
from common.conf.settings import DEFAULT_PAGE_ORIENTATION
from documents.forms import DocumentForm

20
apps/sources/staging.py
View File

@@ -25,12 +25,12 @@ HASH_FUNCTION = lambda x: hashlib.sha256(x).hexdigest()
#}
def evaluate_user_staging_path(request, source):
try:
return STAGING_FILE_FUNCTIONS[source](request)
except Exception, exc:
messages.error(request, _(u'Error evaluating user staging directory expression; %s') % exc)
return u''
#def evaluate_user_staging_path(request, source):
# try:
# return STAGING_FILE_FUNCTIONS[source](request)
# except Exception, exc:
# messages.error(request, _(u'Error evaluating user staging directory expression; %s') % exc)
# return u''
def get_all_files(path):
@@ -115,8 +115,8 @@ class StagingFile(object):
raise Exception(ugettext(u'Unable to upload staging file: %s') % exc)
def delete(self, preview_size):
#tranformation_string, errors = get_transformation_string(DEFAULT_TRANSFORMATIONS)
cache_cleanup(self.filepath, size=preview_size)#, extra_options=tranformation_string)
# tranformation_string, errors = get_transformation_string(DEFAULT_TRANSFORMATIONS)
cache_cleanup(self.filepath, size=preview_size)# , extra_options=tranformation_string)
try:
os.unlink(self.filepath)
except OSError, exc:
@@ -127,8 +127,8 @@ class StagingFile(object):
def preview(self, preview_size):
errors = []
#tranformation_string, errors = get_transformation_string(DEFAULT_TRANSFORMATIONS)
#output_file = convert(self.filepath, size=STAGING_FILES_PREVIEW_SIZE, extra_options=tranformation_string, cleanup_files=False)
# tranformation_string, errors = get_transformation_string(DEFAULT_TRANSFORMATIONS)
# output_file = convert(self.filepath, size=STAGING_FILES_PREVIEW_SIZE, extra_options=tranformation_string, cleanup_files=False)
output_file = convert(self.filepath, size=preview_size, cleanup_files=False)
return output_file, errors

13
apps/sources/views.py
View File

@@ -20,14 +20,13 @@ from document_indexing.api import update_indexes
from history.api import create_history
from metadata.api import save_metadata_list, \
decode_metadata_from_url, metadata_repr_as_list
from metadata.forms import MetadataFormSet, MetadataSelectionForm
from permissions.api import check_permissions
import sendfile
from sources.models import WebForm, StagingFolder
from sources.models import SOURCE_CHOICE_WEB_FORM, SOURCE_CHOICE_STAGING
from sources.models import SOURCE_UNCOMPRESS_CHOICE_Y, \
SOURCE_UNCOMPRESS_CHOICE_N, SOURCE_UNCOMPRESS_CHOICE_ASK
SOURCE_UNCOMPRESS_CHOICE_ASK
from sources.staging import create_staging_file_class
from sources.forms import StagingDocumentForm, WebFormForm
@@ -99,14 +98,14 @@ def upload_interactive(request, source_type=None, source_id=None):
if request.method == 'POST':
form = WebFormForm(request.POST, request.FILES,
document_type=document_type,
show_expand=(web_form.uncompress==SOURCE_UNCOMPRESS_CHOICE_ASK)
show_expand=(web_form.uncompress == SOURCE_UNCOMPRESS_CHOICE_ASK)
)
if form.is_valid():
try:
if web_form.uncompress==SOURCE_UNCOMPRESS_CHOICE_ASK:
if web_form.uncompress == SOURCE_UNCOMPRESS_CHOICE_ASK:
expand = form.cleaned_data['expand']
else:
if web_form.uncompress==SOURCE_UNCOMPRESS_CHOICE_Y:
if web_form.uncompress == SOURCE_UNCOMPRESS_CHOICE_Y:
expand = True
else:
expand = False
@@ -143,10 +142,10 @@ def upload_interactive(request, source_type=None, source_id=None):
if form.is_valid():
try:
staging_file = StagingFile.get(form.cleaned_data['staging_file_id'])
if staging_folder.uncompress==SOURCE_UNCOMPRESS_CHOICE_ASK:
if staging_folder.uncompress == SOURCE_UNCOMPRESS_CHOICE_ASK:
expand = form.cleaned_data['expand']
else:
if staging_folder.uncompress==SOURCE_UNCOMPRESS_CHOICE_Y:
if staging_folder.uncompress == SOURCE_UNCOMPRESS_CHOICE_Y:
expand = True
else:
expand = False