1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-21 11:27:18 +00:00

Added missing import and remove unused imports

This commit is contained in:
zhengxie
2014-02-28 17:09:01 +08:00
parent 57c9e7c433
commit 4c8405a6bf
5 changed files with 14 additions and 24 deletions

View File

@@ -10,8 +10,6 @@ from seahub.utils import IS_EMAIL_CONFIGURED, send_html_email
from captcha.fields import CaptchaField from captcha.fields import CaptchaField
import seahub.settings as settings
class AuthenticationForm(forms.Form): class AuthenticationForm(forms.Form):
""" """
Base class for authenticating users. Extend this to get a form that accepts Base class for authenticating users. Extend this to get a form that accepts

View File

@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import logging import logging
import os import os
import stat
import simplejson as json import simplejson as json
import urllib2 import urllib2
@@ -9,21 +8,18 @@ from django.conf import settings
from django.core.paginator import EmptyPage, InvalidPage from django.core.paginator import EmptyPage, InvalidPage
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.contrib import messages from django.contrib import messages
from django.contrib.sites.models import RequestSite
from django.http import HttpResponse, HttpResponseRedirect, Http404, \ from django.http import HttpResponse, HttpResponseRedirect, Http404, \
HttpResponseBadRequest HttpResponseBadRequest
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.template import Context, loader, RequestContext from django.template import RequestContext
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django.utils.encoding import smart_str
from django.utils import datetime_safe
from django.utils.http import urlquote from django.utils.http import urlquote
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.utils.translation import ungettext from django.utils.translation import ungettext
from seahub.auth.decorators import login_required from seahub.auth.decorators import login_required
import seaserv import seaserv
from seaserv import ccnet_threaded_rpc, seafserv_threaded_rpc, seafserv_rpc, \ from seaserv import ccnet_threaded_rpc, seafserv_threaded_rpc, \
web_get_access_token, seafile_api, \ web_get_access_token, seafile_api, \
get_repo, get_group_repos, get_commits, is_group_user, \ get_repo, get_group_repos, get_commits, is_group_user, \
get_personal_groups_by_user, get_group, get_group_members, create_repo, \ get_personal_groups_by_user, get_group, get_group_members, create_repo, \
@@ -48,7 +44,7 @@ from seahub.notifications.models import UserNotification
from seahub.wiki import get_group_wiki_repo, get_group_wiki_page, convert_wiki_link,\ from seahub.wiki import get_group_wiki_repo, get_group_wiki_page, convert_wiki_link,\
get_wiki_pages get_wiki_pages
from seahub.wiki.models import WikiDoesNotExist, WikiPageMissing, GroupWiki from seahub.wiki.models import WikiDoesNotExist, WikiPageMissing, GroupWiki
from seahub.wiki.utils import clean_page_name, get_wiki_dirent from seahub.wiki.utils import clean_page_name
from seahub.settings import SITE_ROOT, SITE_NAME from seahub.settings import SITE_ROOT, SITE_NAME
from seahub.shortcuts import get_first_object_or_none from seahub.shortcuts import get_first_object_or_none
from seahub.utils import render_error, render_permission_error, string2list, \ from seahub.utils import render_error, render_permission_error, string2list, \

View File

@@ -7,26 +7,25 @@ from django.db import IntegrityError
from django.http import HttpResponse, HttpResponseRedirect, Http404, \ from django.http import HttpResponse, HttpResponseRedirect, Http404, \
HttpResponseBadRequest HttpResponseBadRequest
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.template import Context, loader, RequestContext from django.template import RequestContext
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.views.decorators.http import require_POST from django.views.decorators.http import require_POST
from django.contrib import messages from django.contrib import messages
from django.contrib.sites.models import Site, RequestSite # from django.contrib.sites.models import RequestSite
from pysearpc import SearpcError from pysearpc import SearpcError
import seaserv import seaserv
from seaserv import seafile_api from seaserv import seafile_api
from seaserv import seafserv_threaded_rpc, ccnet_rpc, \ from seaserv import seafserv_threaded_rpc, ccnet_threaded_rpc, \
ccnet_threaded_rpc, get_personal_groups, list_personal_shared_repos, \
is_personal_repo, check_group_staff, is_org_group, get_org_id_by_group, \ is_personal_repo, check_group_staff, is_org_group, get_org_id_by_group, \
del_org_group_repo, list_share_repos, get_group_repos_by_owner, \ del_org_group_repo, get_group_repos_by_owner, \
list_inner_pub_repos_by_owner, remove_share, check_permission list_inner_pub_repos_by_owner, remove_share
from forms import RepoShareForm, FileLinkShareForm, UploadLinkShareForm from forms import RepoShareForm, FileLinkShareForm, UploadLinkShareForm
from models import AnonymousShare, FileShare, PrivateFileDirShare, UploadLinkShare from models import FileShare, PrivateFileDirShare, UploadLinkShare
from signals import share_repo_to_user_successful from signals import share_repo_to_user_successful
from settings import ANONYMOUS_SHARE_COOKIE_TIMEOUT # from settings import ANONYMOUS_SHARE_COOKIE_TIMEOUT
from tokens import anon_share_token_generator # from tokens import anon_share_token_generator
from seahub.auth.decorators import login_required from seahub.auth.decorators import login_required
from seahub.base.accounts import User from seahub.base.accounts import User
from seahub.contacts.models import Contact from seahub.contacts.models import Contact
@@ -36,9 +35,8 @@ from seahub.views import validate_owner, is_registered_user
from seahub.utils import render_permission_error, string2list, render_error, \ from seahub.utils import render_permission_error, string2list, render_error, \
gen_token, gen_shared_link, gen_shared_upload_link, gen_dir_share_link, \ gen_token, gen_shared_link, gen_shared_upload_link, gen_dir_share_link, \
gen_file_share_link, IS_EMAIL_CONFIGURED, check_filename_with_rename, \ gen_file_share_link, IS_EMAIL_CONFIGURED, check_filename_with_rename, \
get_repo_last_modify, is_valid_username, send_html_email is_valid_username, send_html_email
import seahub.settings as settings
try: try:
from seahub.settings import CLOUD_MODE from seahub.settings import CLOUD_MODE
except ImportError: except ImportError:

View File

@@ -96,7 +96,7 @@ import seahub.settings as settings
from seahub.settings import FILE_PREVIEW_MAX_SIZE, INIT_PASSWD, USE_PDFJS, \ from seahub.settings import FILE_PREVIEW_MAX_SIZE, INIT_PASSWD, USE_PDFJS, \
FILE_ENCODING_LIST, FILE_ENCODING_TRY_LIST, AVATAR_FILE_STORAGE, \ FILE_ENCODING_LIST, FILE_ENCODING_TRY_LIST, AVATAR_FILE_STORAGE, \
SEND_EMAIL_ON_ADDING_SYSTEM_MEMBER, SEND_EMAIL_ON_RESETTING_USER_PASSWD, \ SEND_EMAIL_ON_ADDING_SYSTEM_MEMBER, SEND_EMAIL_ON_RESETTING_USER_PASSWD, \
ENABLE_SUB_LIBRARY ENABLE_SUB_LIBRARY, ENABLE_REPO_HISTORY_SETTING
# Get an instance of a logger # Get an instance of a logger
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@@ -11,10 +11,8 @@ from django.core.urlresolvers import reverse
from django.contrib import messages from django.contrib import messages
from django.http import HttpResponse, Http404, HttpResponseRedirect from django.http import HttpResponse, Http404, HttpResponseRedirect
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.template import Context, loader, RequestContext from django.template import RequestContext
from django.template.loader import render_to_string
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.contrib.sites.models import RequestSite
import seaserv import seaserv
from seaserv import ccnet_threaded_rpc, get_emailusers, CALC_SHARE_USAGE from seaserv import ccnet_threaded_rpc, get_emailusers, CALC_SHARE_USAGE