haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-10 03:11:07 +00:00
Code Issues Releases Wiki Activity

Update code styles

Browse Source
This commit is contained in:
zhengxie
2017-03-27 13:58:12 +08:00
parent 1b11350f80
commit f40aa6341b
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/api2/permissions.py
View File

@@ -10,8 +10,6 @@ from django.conf import settings
from seaserv import check_permission, is_repo_owner, ccnet_api from seaserv import check_permission, is_repo_owner, ccnet_api
from seahub.utils import is_pro_version from seahub.utils import is_pro_version
from seahub.utils import is_pro_version
SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS'] SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS']
class IsRepoWritable(BasePermission): class IsRepoWritable(BasePermission):

4
seahub/urls.py
View File

@@ -28,7 +28,7 @@ from seahub.api2.endpoints.upload_links import UploadLinks, UploadLink
from seahub.api2.endpoints.file import FileView from seahub.api2.endpoints.file import FileView
from seahub.api2.endpoints.dir import DirView from seahub.api2.endpoints.dir import DirView
from seahub.api2.endpoints.repo_set_password import RepoSetPassword from seahub.api2.endpoints.repo_set_password import RepoSetPassword
from seahub.api2.endpoints.zip_task import ZipTaskView from seahub.api2.endpoints.zip_task import ZipTaskView
from seahub.api2.endpoints.share_link_zip_task import ShareLinkZipTaskView from seahub.api2.endpoints.share_link_zip_task import ShareLinkZipTaskView
from seahub.api2.endpoints.query_zip_progress import QueryZipProgressView from seahub.api2.endpoints.query_zip_progress import QueryZipProgressView
from seahub.api2.endpoints.copy_move_task import CopyMoveTaskView from seahub.api2.endpoints.copy_move_task import CopyMoveTaskView
@@ -134,7 +134,7 @@ urlpatterns = patterns(
### Misc ### ### Misc ###
url(r'^image-view/(?P<filename>.*)$', image_view, name='image_view'), url(r'^image-view/(?P<filename>.*)$', image_view, name='image_view'),
(r'^file_upload_progress_page/$', file_upload_progress_page), (r'^file_upload_progress_page/$', file_upload_progress_page),
url(r'^i18n/$', i18n, name='i18n'), url(r'^i18n/$', i18n, name='i18n'),
url(r'^convert_cmmt_desc_link/$', convert_cmmt_desc_link, name='convert_cmmt_desc_link'), url(r'^convert_cmmt_desc_link/$', convert_cmmt_desc_link, name='convert_cmmt_desc_link'),
url(r'^modules/toggle/$', toggle_modules, name="toggle_modules"), url(r'^modules/toggle/$', toggle_modules, name="toggle_modules"),

4
seahub/utils/licenseparse.py
View File

@@ -47,7 +47,7 @@ def parse_license():
return ret return ret
def user_number_over_limit(new_users = 0): def user_number_over_limit(new_users=0):
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
if is_pro_version(): if is_pro_version():
try: try:
@@ -59,7 +59,7 @@ def user_number_over_limit(new_users = 0):
active_db_users = ccnet_api.count_emailusers('DB') active_db_users = ccnet_api.count_emailusers('DB')
active_ldap_users = ccnet_api.count_emailusers('LDAP') active_ldap_users = ccnet_api.count_emailusers('LDAP')
active_users = active_db_users + active_ldap_users if \ active_users = active_db_users + active_ldap_users if \
active_ldap_users > 0 else active_db_users active_ldap_users > 0 else active_db_users
if new_users < 0: if new_users < 0:
logger.debug('`new_users` must be greater or equal to 0.') logger.debug('`new_users` must be greater or equal to 0.')

4
tests/api/endpoints/admin/test_default_library.py
View File

@@ -26,7 +26,7 @@ class DefaultLibraryTest(BaseTestCase):
json_resp = json.loads(resp.content) json_resp = json.loads(resp.content)
assert json_resp['user_email'] == self.user_name assert json_resp['user_email'] == self.user_name
assert json_resp['exists'] == False assert json_resp['exists'] is False
def test_can_create(self): def test_can_create(self):
self.login_as(self.admin) self.login_as(self.admin)
@@ -40,7 +40,7 @@ class DefaultLibraryTest(BaseTestCase):
new_default_repo_id = UserOptions.objects.get_default_repo(self.user_name) new_default_repo_id = UserOptions.objects.get_default_repo(self.user_name)
assert json_resp['user_email'] == self.user_name assert json_resp['user_email'] == self.user_name
assert json_resp['exists'] == True assert json_resp['exists'] is True
assert json_resp['repo_id'] == new_default_repo_id assert json_resp['repo_id'] == new_default_repo_id
def test_can_not_get_if_not_admin(self): def test_can_not_get_if_not_admin(self):