diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000000..eb88f0e9a1 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,21 @@ +pipeline: + build: + image: docker.seafile.top/drone/seafile-pro-builder:v4 + pull: true + secrets: [ github_token, npm_token, travis ] + when: + branch: + event: [ push, pull_request ] + include: [ master, python3-master ] + exclude: [] + + commands: + - cd /tmp/seafile-test-deploy && git fetch origin python3:python3 && git checkout python3 + - ./bootstrap.sh && cd - + - export CCNET_CONF_DIR=/tmp/ccnet SEAFILE_CONF_DIR=/tmp/seafile-data + - echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc + - cd /drone/src/github.com/haiwen/seahub + - ./tests/install-deps.sh + - pip install -r test-requirements.txt + - .travis/test_seahub_changes.sh; rc=$?; if test "$rc" -eq 0; then ./tests/seahubtests.sh init && ./tests/seahubtests.sh runserver && ./tests/seahubtests.sh test; else true; fi + - if test $DRONE_COMMIT_BRANCH = "master"; then .travis/dist_and_push.sh; else true; fi diff --git a/.travis.yml b/.travis.yml.bak similarity index 100% rename from .travis.yml rename to .travis.yml.bak diff --git a/.travis/dist_and_push.sh b/.travis/dist_and_push.sh index f74aca3d40..89958346c3 100755 --- a/.travis/dist_and_push.sh +++ b/.travis/dist_and_push.sh @@ -1,5 +1,5 @@ #!/bin/bash -: ${PYTHON=python} +: ${PYTHON=python3} set -e if [[ ${TRAVIS} != "" ]]; then @@ -7,23 +7,25 @@ if [[ ${TRAVIS} != "" ]]; then fi set -x -SEAHUB_TESTSDIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))") +SEAHUB_TESTSDIR=$(python -c "import os; print(os.path.dirname(os.path.realpath('$0')))") SEAHUB_SRCDIR=$(dirname "${SEAHUB_TESTSDIR}") -export PYTHONPATH="/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages:${SEAHUB_SRCDIR}/thirdpart:${PYTHONPATH}" +export PYTHONPATH="/usr/local/lib/python3.7/site-packages:/usr/local/lib/python3.7/dist-packages:/usr/lib/python3.7/site-packages:/usr/lib/python3.7/dist-packages:${SEAHUB_SRCDIR}/thirdpart:${PYTHONPATH}" cd "$SEAHUB_SRCDIR" set +x function commit_dist_files() { - git checkout -b dist-$TRAVIS_BRANCH + git checkout -b dist-$DRONE_COMMIT_BRANCH git add -u . && git add -A media/assets && git add -A static/scripts && git add -A frontend && git add -A locale - git commit -m "[dist] Travis build: #$TRAVIS_BUILD_NUMBER, based on commit $TRAVIS_COMMIT." -m "$TRAVIS_COMMIT_MESSAGE" + git config --global user.email "drone@seafile.com" + git config --global user.name "Drone CI" + git commit -m "[dist][CI SKIP] Drone CI build: #$DRONE_BUILD_NUMBER, based on commit $DRONE_COMMIT." -m "$DRONE_COMMIT_MESSAGE" } function upload_files() { echo 'push dist to seahub' - git remote add token-origin https://imwhatiam:${GITHUB_PERSONAL_ACCESS_TOKEN}@github.com/haiwen/seahub.git - git push -f token-origin dist-$TRAVIS_BRANCH + git remote add token-origin https://$GITHUB_TOKEN@github.com/haiwen/seahub.git + git push -f token-origin dist-$DRONE_COMMIT_BRANCH } function make_dist() { diff --git a/dev-requirements.txt b/dev-requirements.txt index 56eacb74e2..c44cb5e7ff 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,5 +5,5 @@ transifex-client raven==5.0.0 mysqlclient==1.3.12 -pycryptodome==3.7.2 +pycryptodome psd-tools==1.4 diff --git a/fabfile/copyright.py b/fabfile/copyright.py index bf7670cfde..470f65039a 100644 --- a/fabfile/copyright.py +++ b/fabfile/copyright.py @@ -19,15 +19,15 @@ def check(path): def do_update(filename): if 'migrations' in filename: - print 'skip migration file: %s' % filename + print('skip migration file: %s' % filename) return with open(filename) as f: # try read first line of file try: - head = [next(f) for x in xrange(1)] + head = [next(f) for x in range(1)] except StopIteration: - print '%s is empty, skip' % filename + print('%s is empty, skip' % filename) return copy_str = '# Copyright (c) 2012-2016 Seafile Ltd.' @@ -39,11 +39,11 @@ def do_update(filename): need_update = False if not need_update: - print '%s is ok.' % filename + print('%s is ok.' % filename) return line_prepender(filename, copy_str) - print '%s Done.' % filename + print('%s Done.' % filename) def path_to_pyfile_list(path): is_dir = False @@ -78,7 +78,7 @@ def do_check(filename): with open(filename) as f: # try read first line of file try: - head = [next(f) for x in xrange(1)] + head = [next(f) for x in range(1)] except StopIteration: return @@ -89,4 +89,4 @@ def do_check(filename): need_update = False if need_update: - print 'No copyright info in %s.' % filename + print('No copyright info in %s.' % filename) diff --git a/fabfile/locale.py b/fabfile/locale.py index 0d1868fc2e..ad2b39b16d 100644 --- a/fabfile/locale.py +++ b/fabfile/locale.py @@ -18,7 +18,7 @@ def make(default=True, lang='en'): b2 = f.readline() if b1 != b2: - print 'Error: inconsistent Git branch names.' + print('Error: inconsistent Git branch names.') return @@ -63,7 +63,7 @@ def compile(): def _inplace_change(filename, old_string, new_string): s = open(filename).read() if old_string in s: - print(green('Changing "{old_string}" to "{new_string}" in "{filename}"'.format(**locals()))) + print((green('Changing "{old_string}" to "{new_string}" in "{filename}"'.format(**locals())))) s = s.replace(old_string, new_string) f = open(filename, 'w') f.write(s) @@ -71,4 +71,4 @@ def _inplace_change(filename, old_string, new_string): f.close() def _debug(msg): - print(red('Running: {msg}'.format(**locals()))) + print((red('Running: {msg}'.format(**locals())))) diff --git a/requirements.txt b/requirements.txt index 900b91de74..6e6f2a9243 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,23 +1,20 @@ -python-dateutil==2.7.0 -python-memcached==1.57 -chardet==3.0.4 -six==1.11.0 -Pillow==4.3.0 -Django==1.11.15 -django-compressor==2.2 -git+git://github.com/haiwen/django-post_office.git@2312cf240363721f737b5ac8eb86ab8cb255938f#egg=django-post_office -django-statici18n==1.7.0 -djangorestframework==3.3.3 -git+git://github.com/haiwen/django-constance.git@8508ff29141732190faff51d5c2b5474da297732#egg=django-constance[database] -openpyxl==2.3.0 -pytz==2015.7 -django-formtools==2.1 -qrcode==5.3 -requests==2.20.1 -requests_oauthlib==0.8.0 -django-simple-captcha==0.5.6 -gunicorn==19.8.1 -django-webpack-loader==0.6.0 -git+git://github.com/haiwen/python-cas.git@ffc49235fd7cc32c4fdda5acfa3707e1405881df#egg=python_cas -futures==3.2.0 -social-auth-core==1.7.0 +Django==1.11.23 +future +captcha +django-compressor +django-statici18n +django-constance +django-post_office +django-webpack_loader +gunicorn +pymysql +django-picklefield +openpyxl +qrcode +django-formtools +django-simple-captcha +djangorestframework +python-dateutil +requests +pillow +pyjwt diff --git a/seahub/__init__.py b/seahub/__init__.py index 78ff328694..de06494eb0 100644 --- a/seahub/__init__.py +++ b/seahub/__init__.py @@ -1,7 +1,9 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from signals import repo_created, repo_deleted, clean_up_repo_trash, \ +import pymysql +pymysql.install_as_MySQLdb() +from .signals import repo_created, repo_deleted, clean_up_repo_trash, \ repo_restored -from handlers import repo_created_cb, repo_deleted_cb, clean_up_repo_trash_cb, \ +from .handlers import repo_created_cb, repo_deleted_cb, clean_up_repo_trash_cb, \ repo_restored_cb repo_created.connect(repo_created_cb) diff --git a/seahub/admin_log/migrations/0001_initial.py b/seahub/admin_log/migrations/0001_initial.py index 60f27e16a4..ac5cfc6d98 100644 --- a/seahub/admin_log/migrations/0001_initial.py +++ b/seahub/admin_log/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models import datetime diff --git a/seahub/api2/endpoints/address_book/members.py b/seahub/api2/endpoints/address_book/members.py index d5bb321e7b..17d555d343 100644 --- a/seahub/api2/endpoints/address_book/members.py +++ b/seahub/api2/endpoints/address_book/members.py @@ -52,7 +52,7 @@ class AddressBookGroupsSearchMember(APIView): email_list += search_user_from_ccnet(q) email_list += search_user_from_profile(q) # remove duplicate emails - email_list = {}.fromkeys(email_list).keys() + email_list = list({}.fromkeys(email_list).keys()) try: # get all members in current group and its sub groups @@ -64,7 +64,7 @@ class AddressBookGroupsSearchMember(APIView): group_email_list = [m.user_name for m in all_members] # remove duplicate emails - group_email_list = {}.fromkeys(group_email_list).keys() + group_email_list = list({}.fromkeys(group_email_list).keys()) email_result = [] for email in group_email_list: diff --git a/seahub/api2/endpoints/admin/account.py b/seahub/api2/endpoints/admin/account.py index d2911ba0cd..e4ea3f3938 100644 --- a/seahub/api2/endpoints/admin/account.py +++ b/seahub/api2/endpoints/admin/account.py @@ -192,11 +192,11 @@ class Account(APIView): if name is not None: if len(name) > 64: return api_error(status.HTTP_400_BAD_REQUEST, - _(u'Name is too long (maximum is 64 characters)')) + _('Name is too long (maximum is 64 characters)')) if "/" in name: return api_error(status.HTTP_400_BAD_REQUEST, - _(u"Name should not include '/'.")) + _("Name should not include '/'.")) # argument check for list_in_address_book list_in_address_book = request.data.get("list_in_address_book", None) @@ -211,18 +211,18 @@ class Account(APIView): loginid = loginid.strip() if loginid == "": return api_error(status.HTTP_400_BAD_REQUEST, - _(u"Login id can't be empty")) + _("Login id can't be empty")) usernamebyloginid = Profile.objects.get_username_by_login_id(loginid) if usernamebyloginid is not None: return api_error(status.HTTP_400_BAD_REQUEST, - _(u"Login id %s already exists." % loginid)) + _("Login id %s already exists." % loginid)) # argument check for department department = request.data.get("department", None) if department is not None: if len(department) > 512: return api_error(status.HTTP_400_BAD_REQUEST, - _(u'Department is too long (maximum is 512 characters)')) + _('Department is too long (maximum is 512 characters)')) # argument check for institution institution = request.data.get("institution", None) @@ -256,7 +256,7 @@ class Account(APIView): get_file_size_unit('MB') if space_quota_mb > org_quota_mb: return api_error(status.HTTP_400_BAD_REQUEST, \ - _(u'Failed to set quota: maximum quota is %d MB' % org_quota_mb)) + _('Failed to set quota: maximum quota is %d MB' % org_quota_mb)) # argument check for is_trial is_trial = request.data.get("is_trial", None) diff --git a/seahub/api2/endpoints/admin/address_book/groups.py b/seahub/api2/endpoints/admin/address_book/groups.py index 24406955f8..33dad83f8a 100644 --- a/seahub/api2/endpoints/admin/address_book/groups.py +++ b/seahub/api2/endpoints/admin/address_book/groups.py @@ -77,14 +77,14 @@ class AdminAddressBookGroups(APIView): # Check whether group name is validate. if not validate_group_name(group_name): - error_msg = _(u'Name can only contain letters, numbers, blank, hyphen or underscore.') + error_msg = _('Name can only contain letters, numbers, blank, hyphen or underscore.') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) # Check whether group name is duplicated. pattern_matched_groups = ccnet_api.search_groups(group_name, -1, -1) for group in pattern_matched_groups: if group.group_name == group_name: - error_msg = _(u'There is already a group with that name.') + error_msg = _('There is already a group with that name.') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) # Group owner is 'system admin' @@ -228,11 +228,11 @@ class AdminAddressBookGroup(APIView): return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) if has_repo: - error_msg = _(u'There are libraries in this department.') + error_msg = _('There are libraries in this department.') return api_error(status.HTTP_403_FORBIDDEN, error_msg) if len(child_groups) > 0: - error_msg = _(u'There are sub-departments in this department.') + error_msg = _('There are sub-departments in this department.') return api_error(status.HTTP_403_FORBIDDEN, error_msg) try: diff --git a/seahub/api2/endpoints/admin/device_trusted_ip.py b/seahub/api2/endpoints/admin/device_trusted_ip.py index 5350f70db1..2aa8552fbc 100644 --- a/seahub/api2/endpoints/admin/device_trusted_ip.py +++ b/seahub/api2/endpoints/admin/device_trusted_ip.py @@ -1,4 +1,5 @@ # Copyright (c) 2012-2016 Seafile Ltd. +from functools import cmp_to_key from rest_framework.authentication import SessionAuthentication from rest_framework.permissions import IsAdminUser @@ -83,7 +84,7 @@ class AdminDeviceTrustedIP(APIView): @check_parameter def get(self, request, format=None): ip_list = [ip.to_dict() for ip in TrustedIP.objects.all()] - ip_list = sorted(ip_list, cmp=cmp_ip) + ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip)) return Response(ip_list) @check_parameter diff --git a/seahub/api2/endpoints/admin/favicon.py b/seahub/api2/endpoints/admin/favicon.py index db19746b47..3724bedcdc 100644 --- a/seahub/api2/endpoints/admin/favicon.py +++ b/seahub/api2/endpoints/admin/favicon.py @@ -56,7 +56,7 @@ class AdminFavicon(APIView): CUSTOM_FAVICON_PATH) # save favicon file to custom dir - with open(custom_favicon_file, 'w') as fd: + with open(custom_favicon_file, 'wb') as fd: fd.write(favicon_file.read()) custom_symlink = os.path.join(MEDIA_ROOT, diff --git a/seahub/api2/endpoints/admin/file_scan_records.py b/seahub/api2/endpoints/admin/file_scan_records.py index 9ee03d3b55..4c78583c87 100644 --- a/seahub/api2/endpoints/admin/file_scan_records.py +++ b/seahub/api2/endpoints/admin/file_scan_records.py @@ -55,7 +55,7 @@ class AdminFileScanRecords(APIView): else: record["repo_name"] = repo.name record_detail = json.loads(record['detail']) - detail_dict = record_detail.values()[0] + detail_dict = list(record_detail.values())[0] detail = dict() detail["suggestion"] = detail_dict["suggestion"] detail["label"] = detail_dict["label"] diff --git a/seahub/api2/endpoints/admin/group_owned_libraries.py b/seahub/api2/endpoints/admin/group_owned_libraries.py index dd1776647c..960294d0cc 100644 --- a/seahub/api2/endpoints/admin/group_owned_libraries.py +++ b/seahub/api2/endpoints/admin/group_owned_libraries.py @@ -100,7 +100,7 @@ class AdminGroupOwnedLibraries(APIView): storage_id=storage_id) else: # STORAGE_CLASS_MAPPING_POLICY == 'REPO_ID_MAPPING' - if org_id > 0: + if org_id and org_id > 0: repo_id = seafile_api.org_add_group_owned_repo( org_id, group_id, repo_name, permission, password, ENCRYPTED_LIBRARY_VERSION) @@ -109,7 +109,7 @@ class AdminGroupOwnedLibraries(APIView): group_id, repo_name, permission, password, ENCRYPTED_LIBRARY_VERSION) else: - if org_id > 0: + if org_id and org_id > 0: repo_id = seafile_api.org_add_group_owned_repo( org_id, group_id, repo_name, permission, password, ENCRYPTED_LIBRARY_VERSION) diff --git a/seahub/api2/endpoints/admin/groups.py b/seahub/api2/endpoints/admin/groups.py index 03e32fef00..b853f2d08d 100644 --- a/seahub/api2/endpoints/admin/groups.py +++ b/seahub/api2/endpoints/admin/groups.py @@ -117,14 +117,14 @@ class AdminGroups(APIView): group_name = group_name.strip() # Check whether group name is validate. if not validate_group_name(group_name): - error_msg = _(u'Group name can only contain letters, numbers, blank, hyphen, dot, single quote or underscore') + error_msg = _('Group name can only contain letters, numbers, blank, hyphen, dot, single quote or underscore') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) # Check whether group name is duplicated. pattern_matched_groups = ccnet_api.search_groups(group_name, -1, -1) for group in pattern_matched_groups: if group.group_name == group_name: - error_msg = _(u'There is already a group with that name.') + error_msg = _('There is already a group with that name.') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) group_owner = request.data.get('group_owner', '') @@ -200,7 +200,7 @@ class AdminGroup(APIView): old_owner = group.creator_name if new_owner == old_owner: - error_msg = _(u'User %s is already group owner.') % new_owner + error_msg = _('User %s is already group owner.') % new_owner return api_error(status.HTTP_400_BAD_REQUEST, error_msg) # transfer a group diff --git a/seahub/api2/endpoints/admin/libraries.py b/seahub/api2/endpoints/admin/libraries.py index cacea5a4d2..d93b5c10d0 100644 --- a/seahub/api2/endpoints/admin/libraries.py +++ b/seahub/api2/endpoints/admin/libraries.py @@ -138,8 +138,8 @@ class AdminLibraries(APIView): has_next_page = False default_repo_id = get_system_default_repo_id() - repos_all = filter(lambda r: not r.is_virtual, repos_all) - repos_all = filter(lambda r: r.repo_id != default_repo_id, repos_all) + repos_all = [r for r in repos_all if not r.is_virtual] + repos_all = [r for r in repos_all if r.repo_id != default_repo_id] return_results = [] @@ -253,7 +253,7 @@ class AdminLibrary(APIView): try: org_id = seafile_api.get_org_id_by_repo_id(repo_id) related_usernames = get_related_users_by_repo(repo_id, - org_id if org_id > 0 else None) + org_id if org_id and org_id > 0 else None) except Exception as e: logger.error(e) org_id = -1 @@ -342,7 +342,7 @@ class AdminLibrary(APIView): return api_error(status.HTTP_404_NOT_FOUND, error_msg) if not new_owner_obj.permissions.can_add_repo(): - error_msg = _(u'Transfer failed: role of %s is %s, can not add library.') % \ + error_msg = _('Transfer failed: role of %s is %s, can not add library.') % \ (new_owner, new_owner_obj.role) return api_error(status.HTTP_403_FORBIDDEN, error_msg) @@ -363,7 +363,7 @@ class AdminLibrary(APIView): repo_owner = seafile_api.get_repo_owner(repo_id) if new_owner == repo_owner: - error_msg = _(u"Library can not be transferred to owner.") + error_msg = _("Library can not be transferred to owner.") return api_error(status.HTTP_400_BAD_REQUEST, error_msg) # get repo shared to user/group list diff --git a/seahub/api2/endpoints/admin/license.py b/seahub/api2/endpoints/admin/license.py index 30c9ee9b5f..fa39f8ee38 100644 --- a/seahub/api2/endpoints/admin/license.py +++ b/seahub/api2/endpoints/admin/license.py @@ -46,7 +46,7 @@ class AdminLicense(APIView): error_msg = 'path %s invalid.' % LICENSE_PATH return api_error(status.HTTP_400_BAD_REQUEST, error_msg) - with open(LICENSE_PATH, 'w') as fd: + with open(LICENSE_PATH, 'wb') as fd: fd.write(license_file.read()) ccnet_api.reload_license() diff --git a/seahub/api2/endpoints/admin/login_bg_image.py b/seahub/api2/endpoints/admin/login_bg_image.py index 081320f5ec..49e258436c 100644 --- a/seahub/api2/endpoints/admin/login_bg_image.py +++ b/seahub/api2/endpoints/admin/login_bg_image.py @@ -56,7 +56,7 @@ class AdminLoginBgImage(APIView): custom_login_bg_image_file = os.path.join(SEAHUB_DATA_ROOT, custom_login_bg_image_path) # save login background image file to custom dir - with open(custom_login_bg_image_file, 'w') as fd: + with open(custom_login_bg_image_file, 'wb') as fd: fd.write(image_file.read()) custom_symlink = os.path.join(MEDIA_ROOT, diff --git a/seahub/api2/endpoints/admin/org_stats.py b/seahub/api2/endpoints/admin/org_stats.py index e4746e1180..0014caed60 100644 --- a/seahub/api2/endpoints/admin/org_stats.py +++ b/seahub/api2/endpoints/admin/org_stats.py @@ -27,7 +27,7 @@ class AdminOrgStatsTraffic(APIView): 'link-file-upload', 'link-file-download'] init_count = [0] * 6 init_data = get_init_data(start_time, end_time, - dict(zip(op_type_list, init_count))) + dict(list(zip(op_type_list, init_count)))) for e in get_org_traffic_by_day(org_id, start_time, end_time, get_time_offset()): @@ -35,7 +35,7 @@ class AdminOrgStatsTraffic(APIView): init_data[dt].update({op_type: count}) res_data = [] - for k, v in init_data.items(): + for k, v in list(init_data.items()): res = {'datetime': datetime_to_isoformat_timestr(k)} res.update(v) res_data.append(res) diff --git a/seahub/api2/endpoints/admin/shares.py b/seahub/api2/endpoints/admin/shares.py index 0d89573a5c..2a720711c2 100644 --- a/seahub/api2/endpoints/admin/shares.py +++ b/seahub/api2/endpoints/admin/shares.py @@ -177,7 +177,7 @@ class AdminShares(APIView): if repo_owner == email: result['failed'].append({ 'user_email': email, - 'error_msg': _(u'User %s is already library owner.') % email + 'error_msg': _('User %s is already library owner.') % email }) continue @@ -203,7 +203,7 @@ class AdminShares(APIView): if has_shared_to_user(repo.repo_id, path, email): result['failed'].append({ 'email': email, - 'error_msg': _(u'This item has been shared to %s.') % email + 'error_msg': _('This item has been shared to %s.') % email }) continue @@ -260,7 +260,7 @@ class AdminShares(APIView): if has_shared_to_group(repo.repo_id, path, group_id): result['failed'].append({ 'group_name': group.group_name, - 'error_msg': _(u'This item has been shared to %s.') % group.group_name + 'error_msg': _('This item has been shared to %s.') % group.group_name }) continue diff --git a/seahub/api2/endpoints/admin/statistics.py b/seahub/api2/endpoints/admin/statistics.py index dc42bcd506..c88338f94d 100644 --- a/seahub/api2/endpoints/admin/statistics.py +++ b/seahub/api2/endpoints/admin/statistics.py @@ -98,7 +98,7 @@ class FileOperationsView(APIView): ops_modified_dict[e[0]] = e[2] res_data = [] - for k, v in ops_added_dict.items(): + for k, v in list(ops_added_dict.items()): res_data.append({'datetime': datetime_to_isoformat_timestr(k), 'added': v, 'visited': ops_visited_dict[k], @@ -120,7 +120,7 @@ class TotalStorageView(APIView): init_data = get_init_data(start_time, end_time) for e in data: init_data[e[0]] = e[1] - for k, v in init_data.items(): + for k, v in list(init_data.items()): res_data.append({'datetime': datetime_to_isoformat_timestr(k), 'total_storage': v}) return Response(sorted(res_data, key=lambda x: x['datetime'])) @@ -139,7 +139,7 @@ class ActiveUsersView(APIView): init_data = get_init_data(start_time, end_time) for e in data: init_data[e[0]] = e[1] - for k, v in init_data.items(): + for k, v in list(init_data.items()): res_data.append({'datetime': datetime_to_isoformat_timestr(k), 'count': v}) return Response(sorted(res_data, key=lambda x: x['datetime'])) @@ -157,7 +157,7 @@ class SystemTrafficView(APIView): 'link-file-upload', 'link-file-download'] init_count = [0] * 6 init_data = get_init_data(start_time, end_time, - dict(zip(op_type_list, init_count))) + dict(list(zip(op_type_list, init_count)))) for e in get_system_traffic_by_day(start_time, end_time, get_time_offset()): @@ -165,7 +165,7 @@ class SystemTrafficView(APIView): init_data[dt].update({op_type: count}) res_data = [] - for k, v in init_data.items(): + for k, v in list(init_data.items()): res = {'datetime': datetime_to_isoformat_timestr(k)} res.update(v) res_data.append(res) diff --git a/seahub/api2/endpoints/admin/users.py b/seahub/api2/endpoints/admin/users.py index b279a45d60..dbb2187573 100644 --- a/seahub/api2/endpoints/admin/users.py +++ b/seahub/api2/endpoints/admin/users.py @@ -272,7 +272,7 @@ class AdminUsers(APIView): if IS_EMAIL_CONFIGURED and SEND_EMAIL_ON_ADDING_SYSTEM_MEMBER: c = {'user': request.user.username, 'email': email, 'password': password} try: - send_html_email(_(u'You are invited to join %s') % get_site_name(), + send_html_email(_('You are invited to join %s') % get_site_name(), 'sysadmin/user_add_email.html', c, None, [email]) except Exception as e: logger.error(str(e)) @@ -343,7 +343,7 @@ class AdminUser(APIView): username_by_login_id = Profile.objects.get_username_by_login_id(login_id) if username_by_login_id is not None: return api_error(status.HTTP_400_BAD_REQUEST, - _(u"Login id %s already exists." % login_id)) + _("Login id %s already exists." % login_id)) contact_email = request.data.get("contact_email", None) if contact_email is not None and contact_email.strip() != '': diff --git a/seahub/api2/endpoints/admin/work_weixin.py b/seahub/api2/endpoints/admin/work_weixin.py index ae318045a4..560f82fbd2 100644 --- a/seahub/api2/endpoints/admin/work_weixin.py +++ b/seahub/api2/endpoints/admin/work_weixin.py @@ -33,7 +33,6 @@ DEPARTMENT_OWNER = 'system admin' # # uid = corpid + '_' + userid -# from social_django.models import UserSocialAuth # get departments: https://work.weixin.qq.com/api/doc#90000/90135/90208 # get members: https://work.weixin.qq.com/api/doc#90000/90135/90200 diff --git a/seahub/api2/endpoints/copy_move_task.py b/seahub/api2/endpoints/copy_move_task.py index d64b096662..be267a5ed8 100644 --- a/seahub/api2/endpoints/copy_move_task.py +++ b/seahub/api2/endpoints/copy_move_task.py @@ -147,7 +147,7 @@ class CopyMoveTaskView(APIView): # check if above quota for dst repo if seafile_api.check_quota(dst_repo_id, current_size) < 0: - return api_error(HTTP_443_ABOVE_QUOTA, _(u"Out of quota.")) + return api_error(HTTP_443_ABOVE_QUOTA, _("Out of quota.")) new_dirent_name = check_filename_with_rename(dst_repo_id, dst_parent_dir, src_dirent_name) @@ -162,7 +162,7 @@ class CopyMoveTaskView(APIView): if dirent_type == 'dir' and src_repo_id == dst_repo_id and \ dst_parent_dir.startswith(src_dirent_path + '/'): - error_msg = _(u'Can not move directory %(src)s to its subdirectory %(des)s') \ + error_msg = _('Can not move directory %(src)s to its subdirectory %(des)s') \ % {'src': escape(src_dirent_path), 'des': escape(dst_parent_dir)} return api_error(status.HTTP_400_BAD_REQUEST, error_msg) diff --git a/seahub/api2/endpoints/dir.py b/seahub/api2/endpoints/dir.py index 9e3ed3775b..c1e7e1dbc8 100644 --- a/seahub/api2/endpoints/dir.py +++ b/seahub/api2/endpoints/dir.py @@ -83,8 +83,8 @@ def get_dir_file_info_list(username, request_type, repo_obj, parent_dir, # Use dict to reduce memcache fetch cost in large for-loop. nickname_dict = {} contact_email_dict = {} - modifier_set = set([x.modifier for x in file_list]) - lock_owner_set = set([x.lock_owner for x in file_list]) + modifier_set = {x.modifier for x in file_list} + lock_owner_set = {x.lock_owner for x in file_list} for e in modifier_set | lock_owner_set: if e not in nickname_dict: nickname_dict[e] = email2nickname(e) @@ -167,8 +167,8 @@ def get_dir_file_info_list(username, request_type, repo_obj, parent_dir, file_info_list.append(file_info) - dir_info_list.sort(lambda x, y: cmp(x['name'].lower(), y['name'].lower())) - file_info_list.sort(lambda x, y: cmp(x['name'].lower(), y['name'].lower())) + dir_info_list.sort(key=lambda x: x['name'].lower()) + file_info_list.sort(key=lambda x: x['name'].lower()) return dir_info_list, file_info_list @@ -445,7 +445,7 @@ class DirView(APIView): dir_info = self.get_dir_info(repo_id, new_dir_path) resp = Response(dir_info) return resp - except SearpcError, e: + except SearpcError as e: logger.error(e) error_msg = 'Internal Server Error' return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) diff --git a/seahub/api2/endpoints/dir_shared_items.py b/seahub/api2/endpoints/dir_shared_items.py index d3568e8174..bd007105a5 100644 --- a/seahub/api2/endpoints/dir_shared_items.py +++ b/seahub/api2/endpoints/dir_shared_items.py @@ -313,7 +313,7 @@ class DirSharedItemsEndpoint(APIView): if not is_valid_username(to_user): result['failed'].append({ 'email': to_user, - 'error_msg': _(u'username invalid.') + 'error_msg': _('username invalid.') }) continue @@ -322,14 +322,14 @@ class DirSharedItemsEndpoint(APIView): except User.DoesNotExist: result['failed'].append({ 'email': to_user, - 'error_msg': _(u'User %s not found.') % to_user + 'error_msg': _('User %s not found.') % to_user }) continue if self.has_shared_to_user(request, repo_id, path, to_user): result['failed'].append({ 'email': to_user, - 'error_msg': _(u'This item has been shared to %s.') % email2nickname(to_user) + 'error_msg': _('This item has been shared to %s.') % email2nickname(to_user) }) continue @@ -428,7 +428,7 @@ class DirSharedItemsEndpoint(APIView): if self.has_shared_to_group(request, repo_id, path, gid): result['failed'].append({ 'group_name': group.group_name, - 'error_msg': _(u'This item has been shared to %s.') % group.group_name + 'error_msg': _('This item has been shared to %s.') % group.group_name }) continue diff --git a/seahub/api2/endpoints/draft_reviewer.py b/seahub/api2/endpoints/draft_reviewer.py index f72b04ab53..b1edba8674 100644 --- a/seahub/api2/endpoints/draft_reviewer.py +++ b/seahub/api2/endpoints/draft_reviewer.py @@ -67,7 +67,7 @@ class DraftReviewerView(APIView): if not is_valid_username(reviewer): result['failed'].append({ 'email': reviewer, - 'error_msg': _(u'username invalid.') + 'error_msg': _('username invalid.') }) continue @@ -76,7 +76,7 @@ class DraftReviewerView(APIView): except User.DoesNotExist: result['failed'].append({ 'email': reviewer, - 'error_msg': _(u'User %s not found.') % reviewer + 'error_msg': _('User %s not found.') % reviewer }) continue @@ -93,7 +93,7 @@ class DraftReviewerView(APIView): origin_file_path = posixpath.join(uuid.parent_path, uuid.filename) # check perm if seafile_api.check_permission_by_path(d.origin_repo_id, origin_file_path, reviewer) != 'rw': - error_msg = _(u'Permission denied.') + error_msg = _('Permission denied.') result['failed'].append({ 'email': reviewer, 'error_msg': error_msg @@ -101,7 +101,7 @@ class DraftReviewerView(APIView): continue if DraftReviewer.objects.filter(draft=d, reviewer=reviewer): - error_msg = u'Reviewer %s has existed.' % reviewer + error_msg = 'Reviewer %s has existed.' % reviewer result['failed'].append({ 'email': reviewer, 'error_msg': error_msg diff --git a/seahub/api2/endpoints/dtable.py b/seahub/api2/endpoints/dtable.py index 03aaf29c35..3866cc0c11 100644 --- a/seahub/api2/endpoints/dtable.py +++ b/seahub/api2/endpoints/dtable.py @@ -50,7 +50,7 @@ class WorkspacesView(APIView): if is_org_context(request): org_id = request.user.org.org_id - if org_id > 0: + if org_id and org_id > 0: groups = ccnet_api.get_org_groups_by_user(org_id, username) else: groups = ccnet_api.get_groups(username, return_ancestors=True) @@ -80,7 +80,7 @@ class WorkspacesView(APIView): return api_error(status.HTTP_403_FORBIDDEN, error_msg) try: - if org_id > 0: + if org_id and org_id > 0: repo_id = seafile_api.create_org_repo( _("My Workspace"), _("My Workspace"), @@ -166,7 +166,7 @@ class DTablesView(APIView): org_id = request.user.org.org_id try: - if org_id > 0: + if org_id and org_id > 0: repo_id = seafile_api.create_org_repo( _("My Workspace"), _("My Workspace"), diff --git a/seahub/api2/endpoints/file.py b/seahub/api2/endpoints/file.py index 65b4d59fa9..a4fab55f98 100644 --- a/seahub/api2/endpoints/file.py +++ b/seahub/api2/endpoints/file.py @@ -199,7 +199,7 @@ class FileView(APIView): try: seafile_api.post_empty_file(repo_id, parent_dir, new_file_name, username) - except SearpcError, e: + except SearpcError as e: logger.error(e) error_msg = 'Internal Server Error' return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) @@ -572,7 +572,7 @@ class FileView(APIView): expire = request.data.get('expire', FILE_LOCK_EXPIRATION_DAYS) try: seafile_api.lock_file(repo_id, path, username, expire) - except SearpcError, e: + except SearpcError as e: logger.error(e) error_msg = 'Internal Server Error' return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) @@ -587,7 +587,7 @@ class FileView(APIView): # unlock file try: seafile_api.unlock_file(repo_id, path) - except SearpcError, e: + except SearpcError as e: logger.error(e) error_msg = 'Internal Server Error' return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) @@ -605,7 +605,7 @@ class FileView(APIView): # refresh lock file try: seafile_api.refresh_file_lock(repo_id, path) - except SearpcError, e: + except SearpcError as e: logger.error(e) error_msg = 'Internal Server Error' return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) diff --git a/seahub/api2/endpoints/file_tag.py b/seahub/api2/endpoints/file_tag.py index eb1de0403a..c775f21695 100644 --- a/seahub/api2/endpoints/file_tag.py +++ b/seahub/api2/endpoints/file_tag.py @@ -253,7 +253,7 @@ class FileTagsView(APIView): name_list = [name.strip() for name in names.split(",")] for name in name_list: if not check_tagname(name): - error_msg = _(u'Tag can only contain letters, numbers, dot, hyphen or underscore.') + error_msg = _('Tag can only contain letters, numbers, dot, hyphen or underscore.') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) FileTag.objects.delete_all_filetag_by_path(repo_id, parent_path, @@ -277,7 +277,7 @@ class FileTagsView(APIView): name_list = [name.strip() for name in names.split(",")] for name in name_list: if not check_tagname(name): - error_msg = _(u'Tag can only contain letters, numbers, dot, hyphen or underscore.') + error_msg = _('Tag can only contain letters, numbers, dot, hyphen or underscore.') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) res_tag_list = [] @@ -297,10 +297,10 @@ class FileTagView(APIView): @check_parameter def delete(self, request, repo_id, parent_path, filename, name, is_dir): if not name or not check_tagname(name): - error_msg = _(u'Tag can only contain letters, numbers, dot, hyphen or underscore.') + error_msg = _('Tag can only contain letters, numbers, dot, hyphen or underscore.') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) if FileTag.objects.delete_file_tag_by_path(repo_id, - parent_path,filename,is_dir,name): + parent_path, filename, is_dir, name): return Response({"success": True}, status=status.HTTP_200_OK) else: return Response({"success": True}, status=status.HTTP_202_ACCEPTED) diff --git a/seahub/api2/endpoints/group_libraries.py b/seahub/api2/endpoints/group_libraries.py index a19c80a8d1..7a74af659c 100644 --- a/seahub/api2/endpoints/group_libraries.py +++ b/seahub/api2/endpoints/group_libraries.py @@ -82,7 +82,7 @@ class GroupLibraries(APIView): else: group_repos = seafile_api.get_repos_by_group(group_id) - group_repos.sort(lambda x, y: cmp(y.last_modified, x.last_modified)) + group_repos.sort(key=lambda x: x.last_modified, reverse=True) # get repo id owner dict all_repo_owner = [] diff --git a/seahub/api2/endpoints/group_members.py b/seahub/api2/endpoints/group_members.py index 513341bde3..7be9b80236 100644 --- a/seahub/api2/endpoints/group_members.py +++ b/seahub/api2/endpoints/group_members.py @@ -91,13 +91,13 @@ class GroupMembers(APIView): try: if is_group_member(group_id, email): - error_msg = _(u'User %s is already a group member.') % email2nickname(email) + error_msg = _('User %s is already a group member.') % email2nickname(email) return api_error(status.HTTP_400_BAD_REQUEST, error_msg) if is_org_context(request): org_id = request.user.org.org_id if not ccnet_api.org_user_exists(org_id, email): - error_msg = _(u'User %s not found in organization.') % email2nickname(email) + error_msg = _('User %s not found in organization.') % email2nickname(email) return api_error(status.HTTP_404_NOT_FOUND, error_msg) ccnet_api.group_add_member(group_id, username, email) @@ -290,7 +290,7 @@ class GroupMembersBulk(APIView): result['failed'].append({ 'email': email, 'email_name': email_name, - 'error_msg': _(u'User %s is already a group member.') % email_name + 'error_msg': _('User %s is already a group member.') % email_name }) continue @@ -300,7 +300,7 @@ class GroupMembersBulk(APIView): result['failed'].append({ 'email': email, 'email_name': email_name, - 'error_msg': _(u'User %s not found in organization.') % email_name + 'error_msg': _('User %s not found in organization.') % email_name }) continue diff --git a/seahub/api2/endpoints/group_owned_libraries.py b/seahub/api2/endpoints/group_owned_libraries.py index 68b26d70b4..42150b8b40 100644 --- a/seahub/api2/endpoints/group_owned_libraries.py +++ b/seahub/api2/endpoints/group_owned_libraries.py @@ -369,7 +369,7 @@ class GroupOwnedLibraryUserFolderPermission(APIView): if permission: result['failed'].append({ 'user_email': user, - 'error_msg': _(u'Permission already exists.') + 'error_msg': _('Permission already exists.') }) continue @@ -641,7 +641,7 @@ class GroupOwnedLibraryGroupFolderPermission(APIView): if permission: result['failed'].append({ 'group_id': group_id, - 'error_msg': _(u'Permission already exists.') + 'error_msg': _('Permission already exists.') }) continue @@ -914,7 +914,7 @@ class GroupOwnedLibraryUserShare(APIView): if not is_valid_username(to_user): result['failed'].append({ 'email': to_user, - 'error_msg': _(u'username invalid.') + 'error_msg': _('username invalid.') }) continue @@ -923,14 +923,14 @@ class GroupOwnedLibraryUserShare(APIView): except User.DoesNotExist: result['failed'].append({ 'email': to_user, - 'error_msg': _(u'User %s not found.') % to_user + 'error_msg': _('User %s not found.') % to_user }) continue if self.has_shared_to_user(request, repo_id, path, to_user): result['failed'].append({ 'email': to_user, - 'error_msg': _(u'This item has been shared to %s.') % to_user + 'error_msg': _('This item has been shared to %s.') % to_user }) continue @@ -1198,7 +1198,7 @@ class GroupOwnedLibraryGroupShare(APIView): if self.has_shared_to_group(request, repo_id, path, gid): result['failed'].append({ 'group_name': group.group_name, - 'error_msg': _(u'This item has been shared to %s.') % group.group_name + 'error_msg': _('This item has been shared to %s.') % group.group_name }) continue diff --git a/seahub/api2/endpoints/groups.py b/seahub/api2/endpoints/groups.py index 4251bddc56..13d8b191d1 100644 --- a/seahub/api2/endpoints/groups.py +++ b/seahub/api2/endpoints/groups.py @@ -41,7 +41,7 @@ logger = logging.getLogger(__name__) def get_group_admins(group_id): members = seaserv.get_group_members(group_id) - admin_members = filter(lambda m: m.is_staff, members) + admin_members = [m for m in members if m.is_staff] admins = [] for u in admin_members: @@ -208,12 +208,12 @@ class Groups(APIView): # Check whether group name is validate. if not validate_group_name(group_name): - error_msg = _(u'Group name can only contain letters, numbers, blank, hyphen, dot, single quote or underscore') + error_msg = _('Group name can only contain letters, numbers, blank, hyphen, dot, single quote or underscore') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) # Check whether group name is duplicated. if check_group_name_conflict(request, group_name): - error_msg = _(u'There is already a group with that name.') + error_msg = _('There is already a group with that name.') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) # create group. @@ -284,12 +284,12 @@ class Group(APIView): # Check whether group name is validate. if not validate_group_name(new_group_name): - error_msg = _(u'Group name can only contain letters, numbers, blank, hyphen or underscore') + error_msg = _('Group name can only contain letters, numbers, blank, hyphen or underscore') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) # Check whether group name is duplicated. if check_group_name_conflict(request, new_group_name): - error_msg = _(u'There is already a group with that name.') + error_msg = _('There is already a group with that name.') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) seaserv.ccnet_threaded_rpc.set_group_name(group_id, new_group_name) @@ -314,7 +314,7 @@ class Group(APIView): return api_error(status.HTTP_400_BAD_REQUEST, error_msg) if is_group_owner(group_id, new_owner): - error_msg = _(u'User %s is already group owner.') % new_owner + error_msg = _('User %s is already group owner.') % new_owner return api_error(status.HTTP_400_BAD_REQUEST, error_msg) # transfer a group diff --git a/seahub/api2/endpoints/move_folder_merge.py b/seahub/api2/endpoints/move_folder_merge.py index 97f15c7bad..9655e8a850 100644 --- a/seahub/api2/endpoints/move_folder_merge.py +++ b/seahub/api2/endpoints/move_folder_merge.py @@ -169,7 +169,7 @@ class MoveFolderMergeView(APIView): src_repo.version, dir_id) if seafile_api.check_quota(dst_repo_id, current_size) < 0: - return api_error(HTTP_443_ABOVE_QUOTA, _(u"Out of quota.")) + return api_error(HTTP_443_ABOVE_QUOTA, _("Out of quota.")) username = request.user.username move_folder_with_merge(username, diff --git a/seahub/api2/endpoints/query_copy_move_progress.py b/seahub/api2/endpoints/query_copy_move_progress.py index f69eaafc10..9ea77d66d4 100644 --- a/seahub/api2/endpoints/query_copy_move_progress.py +++ b/seahub/api2/endpoints/query_copy_move_progress.py @@ -44,7 +44,7 @@ class QueryCopyMoveProgressView(APIView): # res can be None if not res: - error_msg = _(u'Error') + error_msg = _('Error') return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) result = {} diff --git a/seahub/api2/endpoints/related_files.py b/seahub/api2/endpoints/related_files.py index e7829a8ad0..2660f1cc77 100644 --- a/seahub/api2/endpoints/related_files.py +++ b/seahub/api2/endpoints/related_files.py @@ -215,7 +215,7 @@ class RelatedFileView(APIView): # permission check if check_folder_permission(request, repo_id, '/') != PERMISSION_READ_WRITE: - print check_folder_permission(request, repo_id, file_path) + print(check_folder_permission(request, repo_id, file_path)) error_msg = 'Permission denied.' return api_error(status.HTTP_403_FORBIDDEN, error_msg) diff --git a/seahub/api2/endpoints/repo_history.py b/seahub/api2/endpoints/repo_history.py index 2f03db147c..4798d40854 100644 --- a/seahub/api2/endpoints/repo_history.py +++ b/seahub/api2/endpoints/repo_history.py @@ -129,14 +129,14 @@ class RepoHistory(APIView): revision_tags = [] for tag in revision_tags: - if commit_tag_dict.has_key(tag.revision_id): + if tag.revision_id in commit_tag_dict: commit_tag_dict[tag.revision_id].append(tag.tag.name) else: commit_tag_dict[tag.revision_id] = [tag.tag.name] for item in items: item['tags'] = [] - for commit_id, tags in commit_tag_dict.items(): + for commit_id, tags in list(commit_tag_dict.items()): if commit_id == item['commit_id']: item['tags'] = tags diff --git a/seahub/api2/endpoints/repo_send_new_password.py b/seahub/api2/endpoints/repo_send_new_password.py index 48cfadd4ac..af7f590c77 100644 --- a/seahub/api2/endpoints/repo_send_new_password.py +++ b/seahub/api2/endpoints/repo_send_new_password.py @@ -41,7 +41,7 @@ class RepoSendNewPassword(APIView): if not ENABLE_RESET_ENCRYPTED_REPO_PASSWORD or \ not IS_EMAIL_CONFIGURED: - error_msg = _(u'Feature disabled.') + error_msg = _('Feature disabled.') return api_error(status.HTTP_403_FORBIDDEN, error_msg) # resource check @@ -62,14 +62,14 @@ class RepoSendNewPassword(APIView): secret_key = RepoSecretKey.objects.get_secret_key(repo_id) if not secret_key: - error_msg = _(u"Can not reset this library's password.") + error_msg = _("Can not reset this library's password.") return api_error(HTTP_520_OPERATION_FAILED, error_msg) new_password = get_random_string(10) try: seafile_api.reset_repo_passwd(repo_id, username, secret_key, new_password) content = {'repo_name': repo.name, 'password': new_password,} - send_html_email(_(u'New password of library %s') % repo.name, + send_html_email(_('New password of library %s') % repo.name, 'snippets/reset_repo_password.html', content, None, [email2contact_email(username)]) except Exception as e: diff --git a/seahub/api2/endpoints/repo_set_password.py b/seahub/api2/endpoints/repo_set_password.py index 2ec35a7fca..801cde7edd 100644 --- a/seahub/api2/endpoints/repo_set_password.py +++ b/seahub/api2/endpoints/repo_set_password.py @@ -64,13 +64,13 @@ class RepoSetPassword(APIView): error_msg = 'Bad arguments' return api_error(status.HTTP_400_BAD_REQUEST, error_msg) elif e.msg == 'Incorrect password': - error_msg = _(u'Wrong password') + error_msg = _('Wrong password') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) elif e.msg == 'Internal server error': - error_msg = _(u'Internal server error') + error_msg = _('Internal server error') return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) else: - error_msg = _(u'Decrypt library error') + error_msg = _('Decrypt library error') return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) if ENABLE_RESET_ENCRYPTED_REPO_PASSWORD: @@ -124,7 +124,7 @@ class RepoSetPassword(APIView): seafile_api.change_repo_passwd(repo_id, old_password, new_password, username) except Exception as e: if e.msg == 'Incorrect password': - error_msg = _(u'Wrong old password') + error_msg = _('Wrong old password') return api_error(status.HTTP_403_FORBIDDEN, error_msg) else: logger.error(e) @@ -157,7 +157,7 @@ class RepoSetPassword(APIView): secret_key = RepoSecretKey.objects.get_secret_key(repo_id) if not secret_key: - error_msg = _(u"Can not reset this library's password.") + error_msg = _("Can not reset this library's password.") return api_error(status.HTTP_400_BAD_REQUEST, error_msg) try: diff --git a/seahub/api2/endpoints/repo_tags.py b/seahub/api2/endpoints/repo_tags.py index 059decd8c0..d71ede4ba4 100644 --- a/seahub/api2/endpoints/repo_tags.py +++ b/seahub/api2/endpoints/repo_tags.py @@ -70,7 +70,7 @@ class RepoTagsView(APIView): for repo_tag in repo_tag_list: res = repo_tag.to_dict() repo_tag_id = res["repo_tag_id"] - if files_count.has_key(repo_tag_id): + if repo_tag_id in files_count: res["files_count"] = files_count[repo_tag_id] else: res["files_count"] = 0 diff --git a/seahub/api2/endpoints/repo_trash.py b/seahub/api2/endpoints/repo_trash.py index b52d587acb..7952d2b747 100644 --- a/seahub/api2/endpoints/repo_trash.py +++ b/seahub/api2/endpoints/repo_trash.py @@ -112,8 +112,8 @@ class RepoTrash(APIView): entries_without_scan_stat = deleted_entries[0:-1] # sort entry by delete time - entries_without_scan_stat.sort(lambda x, y : cmp(y.delete_time, - x.delete_time)) + entries_without_scan_stat.sort( + key=lambda x: x.delete_time, reverse=True) for item in entries_without_scan_stat: item_info = self.get_item_info(item) diff --git a/seahub/api2/endpoints/repos.py b/seahub/api2/endpoints/repos.py index aaf2c81613..801502376f 100644 --- a/seahub/api2/endpoints/repos.py +++ b/seahub/api2/endpoints/repos.py @@ -28,7 +28,7 @@ from seahub.utils.repo import get_repo_owner, is_repo_admin, \ from seahub.settings import ENABLE_STORAGE_CLASSES -from seaserv import seafile_api, send_message +from seaserv import seafile_api logger = logging.getLogger(__name__) @@ -56,7 +56,7 @@ class ReposView(APIView): request_type_list = request.GET.getlist('type', "") if not request_type_list: # set all to True, no filter applied - filter_by = filter_by.fromkeys(filter_by.iterkeys(), True) + filter_by = filter_by.fromkeys(iter(filter_by.keys()), True) for request_type in request_type_list: request_type = request_type.strip() @@ -90,14 +90,14 @@ class ReposView(APIView): ret_corrupted=True) # Reduce memcache fetch ops. - modifiers_set = set([x.last_modifier for x in owned_repos]) + modifiers_set = {x.last_modifier for x in owned_repos} for e in modifiers_set: if e not in contact_email_dict: contact_email_dict[e] = email2contact_email(e) if e not in nickname_dict: nickname_dict[e] = email2nickname(e) - owned_repos.sort(lambda x, y: cmp(y.last_modify, x.last_modify)) + owned_repos.sort(key=lambda x: x.last_modify, reverse=True) for r in owned_repos: # do not return virtual repos @@ -141,15 +141,15 @@ class ReposView(APIView): get_repos_with_admin_permission(email) # Reduce memcache fetch ops. - owners_set = set([x.user for x in shared_repos]) - modifiers_set = set([x.last_modifier for x in shared_repos]) + owners_set = {x.user for x in shared_repos} + modifiers_set = {x.last_modifier for x in shared_repos} for e in owners_set | modifiers_set: if e not in contact_email_dict: contact_email_dict[e] = email2contact_email(e) if e not in nickname_dict: nickname_dict[e] = email2nickname(e) - shared_repos.sort(lambda x, y: cmp(y.last_modify, x.last_modify)) + shared_repos.sort(key=lambda x: x.last_modify, reverse=True) for r in shared_repos: owner_email = r.user @@ -198,11 +198,11 @@ class ReposView(APIView): else: group_repos = seafile_api.get_group_repos_by_user(email) - group_repos.sort(lambda x, y: cmp(y.last_modify, x.last_modify)) + group_repos.sort(key=lambda x: x.last_modify, reverse=True) # Reduce memcache fetch ops. - share_from_set = set([x.user for x in group_repos]) - modifiers_set = set([x.last_modifier for x in group_repos]) + share_from_set = {x.user for x in group_repos} + modifiers_set = {x.last_modifier for x in group_repos} for e in modifiers_set | share_from_set: if e not in contact_email_dict: contact_email_dict[e] = email2contact_email(e) @@ -243,8 +243,8 @@ class ReposView(APIView): # Reduce memcache fetch ops. owner_set = set(all_repo_owner) - share_from_set = set([x.user for x in public_repos]) - modifiers_set = set([x.last_modifier for x in public_repos]) + share_from_set = {x.user for x in public_repos} + modifiers_set = {x.last_modifier for x in public_repos} for e in modifiers_set | share_from_set | owner_set: if e not in contact_email_dict: contact_email_dict[e] = email2contact_email(e) @@ -276,7 +276,7 @@ class ReposView(APIView): timestamp = utc_dt.strftime('%Y-%m-%d %H:%M:%S') org_id = request.user.org.org_id if is_org_context(request) else -1 try: - send_message('seahub.stats', 'user-login\t%s\t%s\t%s' % (email, timestamp, org_id)) + seafile_api.publish_event('seahub.stats', 'user-login\t%s\t%s\t%s' % (email, timestamp, org_id)) except Exception as e: logger.error('Error when sending user-login message: %s' % str(e)) diff --git a/seahub/api2/endpoints/repos_batch.py b/seahub/api2/endpoints/repos_batch.py index a17fbedd33..9502d3ea69 100644 --- a/seahub/api2/endpoints/repos_batch.py +++ b/seahub/api2/endpoints/repos_batch.py @@ -488,7 +488,7 @@ class ReposBatchCopyDirView(APIView): # check if above quota for dst repo if seafile_api.check_quota(dst_repo_id, total_size) < 0: - return api_error(HTTP_443_ABOVE_QUOTA, _(u"Out of quota.")) + return api_error(HTTP_443_ABOVE_QUOTA, _("Out of quota.")) result = {} result['failed'] = [] @@ -1249,18 +1249,18 @@ class ReposAsyncBatchMoveItemView(APIView): locked_files = get_locked_files_by_dir(request, src_repo_id, src_parent_dir) for dirent in src_dirents: # file is locked and lock owner is not current user - if dirent in locked_files.keys() and \ + if dirent in list(locked_files.keys()) and \ locked_files[dirent] != username: - error_msg = _(u'File %s is locked.') % dirent + error_msg = _('File %s is locked.') % dirent return api_error(status.HTTP_403_FORBIDDEN, error_msg) # check sub folder permission folder_permission_dict = get_sub_folder_permission_by_dir(request, src_repo_id, src_parent_dir) for dirent in src_dirents: - if dirent in folder_permission_dict.keys() and \ + if dirent in list(folder_permission_dict.keys()) and \ folder_permission_dict[dirent] != 'rw': - error_msg = _(u"Can't move folder %s, please check its permission.") % dirent + error_msg = _("Can't move folder %s, please check its permission.") % dirent return api_error(status.HTTP_403_FORBIDDEN, error_msg) # move file @@ -1468,18 +1468,18 @@ class ReposSyncBatchMoveItemView(APIView): locked_files = get_locked_files_by_dir(request, src_repo_id, src_parent_dir) for dirent in src_dirents: # file is locked and lock owner is not current user - if dirent in locked_files.keys() and \ + if dirent in list(locked_files.keys()) and \ locked_files[dirent] != username: - error_msg = _(u'File %s is locked.') % dirent + error_msg = _('File %s is locked.') % dirent return api_error(status.HTTP_403_FORBIDDEN, error_msg) # check sub folder permission folder_permission_dict = get_sub_folder_permission_by_dir(request, src_repo_id, src_parent_dir) for dirent in src_dirents: - if dirent in folder_permission_dict.keys() and \ + if dirent in list(folder_permission_dict.keys()) and \ folder_permission_dict[dirent] != 'rw': - error_msg = _(u"Can't move folder %s, please check its permission.") % dirent + error_msg = _("Can't move folder %s, please check its permission.") % dirent return api_error(status.HTTP_403_FORBIDDEN, error_msg) # move file @@ -1557,17 +1557,17 @@ class ReposBatchDeleteItemView(APIView): locked_files = get_locked_files_by_dir(request, repo_id, parent_dir) for dirent in dirents: # file is locked and lock owner is not current user - if dirent in locked_files.keys() and \ + if dirent in list(locked_files.keys()) and \ locked_files[dirent] != username: - error_msg = _(u'File %s is locked.') % dirent + error_msg = _('File %s is locked.') % dirent return api_error(status.HTTP_403_FORBIDDEN, error_msg) # check sub folder permission folder_permission_dict = get_sub_folder_permission_by_dir(request, repo_id, parent_dir) for dirent in dirents: - if dirent in folder_permission_dict.keys() and \ + if dirent in list(folder_permission_dict.keys()) and \ folder_permission_dict[dirent] != 'rw': - error_msg = _(u"Can't delete folder %s, please check its permission.") % dirent + error_msg = _("Can't delete folder %s, please check its permission.") % dirent return api_error(status.HTTP_403_FORBIDDEN, error_msg) # delete file diff --git a/seahub/api2/endpoints/search_user.py b/seahub/api2/endpoints/search_user.py index 009595e0b7..97d587e1b7 100644 --- a/seahub/api2/endpoints/search_user.py +++ b/seahub/api2/endpoints/search_user.py @@ -120,7 +120,7 @@ class SearchUser(APIView): ## search finished, now filter out some users # remove duplicate emails - email_list = {}.fromkeys(email_list).keys() + email_list = list({}.fromkeys(email_list).keys()) email_result = [] diff --git a/seahub/api2/endpoints/send_share_link_email.py b/seahub/api2/endpoints/send_share_link_email.py index f3f4636b44..73065a30b3 100644 --- a/seahub/api2/endpoints/send_share_link_email.py +++ b/seahub/api2/endpoints/send_share_link_email.py @@ -30,7 +30,7 @@ class SendShareLinkView(APIView): def post(self, request): if not IS_EMAIL_CONFIGURED: - error_msg = _(u'Sending shared link failed. Email service is not properly configured, please contact administrator.') + error_msg = _('Sending shared link failed. Email service is not properly configured, please contact administrator.') return api_error(status.HTTP_403_FORBIDDEN, error_msg) # check args @@ -97,11 +97,11 @@ class SendShareLinkView(APIView): template = 'shared_link_email.html' if link.s_type == 'f': - c['file_shared_type'] = _(u"file") - title = _(u'A file is shared to you on %s') % get_site_name() + c['file_shared_type'] = _("file") + title = _('A file is shared to you on %s') % get_site_name() else: - c['file_shared_type'] = _(u"directory") - title = _(u'A directory is shared to you on %s') % get_site_name() + c['file_shared_type'] = _("directory") + title = _('A directory is shared to you on %s') % get_site_name() # send email try: diff --git a/seahub/api2/endpoints/send_upload_link_email.py b/seahub/api2/endpoints/send_upload_link_email.py index 3f49d5bc18..fd045b645d 100644 --- a/seahub/api2/endpoints/send_upload_link_email.py +++ b/seahub/api2/endpoints/send_upload_link_email.py @@ -29,7 +29,7 @@ class SendUploadLinkView(APIView): def post(self, request): if not IS_EMAIL_CONFIGURED: - error_msg = _(u'Sending shared link failed. Email service is not properly configured, please contact administrator.') + error_msg = _('Sending shared link failed. Email service is not properly configured, please contact administrator.') return api_error(status.HTTP_403_FORBIDDEN, error_msg) # check args @@ -70,7 +70,7 @@ class SendUploadLinkView(APIView): if not is_valid_email(to_email): failed_info['email'] = to_email - failed_info['error_msg'] = _(u'email invalid.') + failed_info['error_msg'] = _('email invalid.') result['failed'].append(failed_info) continue @@ -92,7 +92,7 @@ class SendUploadLinkView(APIView): reply_to = None c['shared_upload_link'] = gen_shared_upload_link(token) - title = _(u'An upload link is shared to you on %s') % get_site_name() + title = _('An upload link is shared to you on %s') % get_site_name() template = 'shared_upload_link_email.html' # send email @@ -102,7 +102,7 @@ class SendUploadLinkView(APIView): except Exception as e: logger.error(e) failed_info['email'] = to_email - failed_info['error_msg'] = _(u'Internal Server Error') + failed_info['error_msg'] = _('Internal Server Error') result['failed'].append(failed_info) return Response(result) diff --git a/seahub/api2/endpoints/share_links.py b/seahub/api2/endpoints/share_links.py index 32a34f5931..cf0126f6fe 100644 --- a/seahub/api2/endpoints/share_links.py +++ b/seahub/api2/endpoints/share_links.py @@ -93,7 +93,7 @@ def check_permissions_arg(request): if permissions is not None: if isinstance(permissions, dict): perm_dict = permissions - elif isinstance(permissions, basestring): + elif isinstance(permissions, str): import json try: perm_dict = json.loads(permissions) @@ -164,7 +164,7 @@ class ShareLinks(APIView): return api_error(status.HTTP_404_NOT_FOUND, error_msg) # filter share links by repo - fileshares = filter(lambda fs: fs.repo_id == repo_id, fileshares) + fileshares = [fs for fs in fileshares if fs.repo_id == repo_id] path = request.GET.get('path', None) if path: @@ -189,7 +189,7 @@ class ShareLinks(APIView): if s_type == 'd' and path[-1] != '/': path = path + '/' - fileshares = filter(lambda fs: fs.path == path, fileshares) + fileshares = [fs for fs in fileshares if fs.path == path] links_info = [] for fs in fileshares: @@ -199,11 +199,11 @@ class ShareLinks(APIView): if len(links_info) == 1: result = links_info else: - dir_list = filter(lambda x: x['is_dir'], links_info) - file_list = filter(lambda x: not x['is_dir'], links_info) + dir_list = [x for x in links_info if x['is_dir']] + file_list = [x for x in links_info if not x['is_dir']] - dir_list.sort(lambda x, y: cmp(x['obj_name'], y['obj_name'])) - file_list.sort(lambda x, y: cmp(x['obj_name'], y['obj_name'])) + dir_list.sort(key=lambda x: x['obj_name']) + file_list.sort(key=lambda x: x['obj_name']) result = dir_list + file_list @@ -297,7 +297,7 @@ class ShareLinks(APIView): if s_type == 'f': fs = FileShare.objects.get_file_link_by_path(username, repo_id, path) if fs: - error_msg = _(u'Share link %s already exists.' % fs.token) + error_msg = _('Share link %s already exists.' % fs.token) return api_error(status.HTTP_400_BAD_REQUEST, error_msg) fs = FileShare.objects.create_file_link(username, repo_id, path, password, expire_date, @@ -306,7 +306,7 @@ class ShareLinks(APIView): elif s_type == 'd': fs = FileShare.objects.get_dir_link_by_path(username, repo_id, path) if fs: - error_msg = _(u'Share link %s already exists.' % fs.token) + error_msg = _('Share link %s already exists.' % fs.token) return api_error(status.HTTP_400_BAD_REQUEST, error_msg) fs = FileShare.objects.create_dir_link(username, repo_id, path, password, expire_date, @@ -454,7 +454,7 @@ class ShareLinkOnlineOfficeLock(APIView): # refresh lock file try: seafile_api.refresh_file_lock(repo_id, path) - except SearpcError, e: + except SearpcError as e: logger.error(e) error_msg = 'Internal Server Error' return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) diff --git a/seahub/api2/endpoints/shared_folders.py b/seahub/api2/endpoints/shared_folders.py index 0cedeaf17b..70ae1c4596 100644 --- a/seahub/api2/endpoints/shared_folders.py +++ b/seahub/api2/endpoints/shared_folders.py @@ -49,7 +49,7 @@ class SharedFolders(APIView): return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) returned_result = [] - shared_repos.sort(lambda x, y: cmp(x.repo_name, y.repo_name)) + shared_repos.sort(key=lambda x: x.repo_name) for repo in shared_repos: if not repo.is_virtual: continue diff --git a/seahub/api2/endpoints/shared_repos.py b/seahub/api2/endpoints/shared_repos.py index 100b112a4e..2bcb0bc4fb 100644 --- a/seahub/api2/endpoints/shared_repos.py +++ b/seahub/api2/endpoints/shared_repos.py @@ -55,7 +55,7 @@ class SharedRepos(APIView): return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) returned_result = [] - shared_repos.sort(lambda x, y: cmp(x.repo_name, y.repo_name)) + shared_repos.sort(key=lambda x: x.repo_name) usernames = [] gids = [] for repo in shared_repos: @@ -309,10 +309,10 @@ class SharedRepo(APIView): if share_type == 'public': pub_repos = [] if org_id: - pub_repos = seaserv.list_org_inner_pub_repos(org_id, username) + pub_repos = seafile_api.list_org_inner_pub_repos(org_id) if not request.cloud_mode: - pub_repos = seaserv.list_inner_pub_repos(username) + pub_repos = seafile_api.get_inner_pub_repo_list() try: if org_id: diff --git a/seahub/api2/endpoints/starred_items.py b/seahub/api2/endpoints/starred_items.py index 49d2e78ab4..ef11db1da5 100644 --- a/seahub/api2/endpoints/starred_items.py +++ b/seahub/api2/endpoints/starred_items.py @@ -105,9 +105,9 @@ class StarredItems(APIView): else: starred_files.append(item_info) - starred_repos.sort(lambda x, y: cmp(y['mtime'], x['mtime'])) - starred_folders.sort(lambda x, y: cmp(y['mtime'], x['mtime'])) - starred_files.sort(lambda x, y: cmp(y['mtime'], x['mtime'])) + starred_repos.sort(key=lambda x: x['mtime'], reverse=True) + starred_folders.sort(key=lambda x: x['mtime'], reverse=True) + starred_files.sort(key=lambda x: x['mtime'], reverse=True) return Response({'starred_item_list': starred_repos + \ starred_folders + starred_files}) diff --git a/seahub/api2/endpoints/upload_links.py b/seahub/api2/endpoints/upload_links.py index 290b0ebff7..5a84744e6b 100644 --- a/seahub/api2/endpoints/upload_links.py +++ b/seahub/api2/endpoints/upload_links.py @@ -95,7 +95,7 @@ class UploadLinks(APIView): return api_error(status.HTTP_404_NOT_FOUND, error_msg) # filter share links by repo - upload_link_shares = filter(lambda ufs: ufs.repo_id==repo_id, upload_link_shares) + upload_link_shares = [ufs for ufs in upload_link_shares if ufs.repo_id==repo_id] path = request.GET.get('path', None) if path: @@ -114,7 +114,7 @@ class UploadLinks(APIView): path = path + '/' # filter share links by path - upload_link_shares = filter(lambda ufs: ufs.path==path, upload_link_shares) + upload_link_shares = [ufs for ufs in upload_link_shares if ufs.path==path] result = [] for uls in upload_link_shares: @@ -124,7 +124,7 @@ class UploadLinks(APIView): if len(result) == 1: result = result else: - result.sort(lambda x, y: cmp(x['obj_name'], y['obj_name'])) + result.sort(key=lambda x: x['obj_name']) return Response(result) diff --git a/seahub/api2/endpoints/user.py b/seahub/api2/endpoints/user.py index 03ed675956..cb4ccb521c 100644 --- a/seahub/api2/endpoints/user.py +++ b/seahub/api2/endpoints/user.py @@ -54,7 +54,7 @@ class User(APIView): # update account telephone if info_dict['telephone']: - DetailedProfile.objects.add_or_update(email, department=None , telephone=info_dict['telephone']) + DetailedProfile.objects.add_or_update(email, department=None, telephone=info_dict['telephone']) # update user list_in_address_book if info_dict['list_in_address_book']: @@ -70,7 +70,7 @@ class User(APIView): email = request.user.username if not ENABLE_UPDATE_USER_INFO: - error_msg = _(u'Feature disabled.') + error_msg = _('Feature disabled.') return api_error(status.HTTP_403_FORBIDDEN, error_msg) # argument check for name @@ -78,11 +78,11 @@ class User(APIView): if name: name = name.strip() if len(name) > 64: - error_msg = _(u'Name is too long (maximum is 64 characters)') + error_msg = _('Name is too long (maximum is 64 characters)') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) if "/" in name: - error_msg = _(u"Name should not include '/'.") + error_msg = _("Name should not include '/'.") return api_error(status.HTTP_400_BAD_REQUEST, error_msg) # argument check for contact_email @@ -90,7 +90,7 @@ class User(APIView): if contact_email: if not ENABLE_USER_SET_CONTACT_EMAIL: - error_msg = _(u'Feature disabled.') + error_msg = _('Feature disabled.') return api_error(status.HTTP_403_FORBIDDEN, error_msg) profile = Profile.objects.get_profile_by_contact_email(contact_email) diff --git a/seahub/api2/endpoints/user_avatar.py b/seahub/api2/endpoints/user_avatar.py index 67d66b5708..86bd89ae0f 100644 --- a/seahub/api2/endpoints/user_avatar.py +++ b/seahub/api2/endpoints/user_avatar.py @@ -46,17 +46,17 @@ class UserAvatarView(APIView): (root, ext) = os.path.splitext(image_file.name.lower()) if AVATAR_ALLOWED_FILE_EXTS and ext not in AVATAR_ALLOWED_FILE_EXTS: - error_msg = _(u"%(ext)s is an invalid file extension. Authorized extensions are : %(valid_exts_list)s") % {'ext' : ext, 'valid_exts_list' : ", ".join(AVATAR_ALLOWED_FILE_EXTS)} + error_msg = _("%(ext)s is an invalid file extension. Authorized extensions are : %(valid_exts_list)s") % {'ext' : ext, 'valid_exts_list' : ", ".join(AVATAR_ALLOWED_FILE_EXTS)} return api_error(status.HTTP_400_BAD_REQUEST, error_msg) if image_file.size > AVATAR_MAX_SIZE: - error_msg = _(u"Your file is too big (%(size)s), the maximum allowed size is %(max_valid_size)s") % { 'size' : filesizeformat(image_file.size), 'max_valid_size' : filesizeformat(AVATAR_MAX_SIZE)} + error_msg = _("Your file is too big (%(size)s), the maximum allowed size is %(max_valid_size)s") % { 'size' : filesizeformat(image_file.size), 'max_valid_size' : filesizeformat(AVATAR_MAX_SIZE)} return api_error(status.HTTP_400_BAD_REQUEST, error_msg) username = request.user.username count = Avatar.objects.filter(emailuser=username).count() if AVATAR_MAX_AVATARS_PER_USER > 1 and count >= AVATAR_MAX_AVATARS_PER_USER: - error_msg = _(u"You already have %(nb_avatars)d avatars, and the maximum allowed is %(nb_max_avatars)d.") % { 'nb_avatars' : count, 'nb_max_avatars' : AVATAR_MAX_AVATARS_PER_USER} + error_msg = _("You already have %(nb_avatars)d avatars, and the maximum allowed is %(nb_max_avatars)d.") % { 'nb_avatars' : count, 'nb_max_avatars' : AVATAR_MAX_AVATARS_PER_USER} return api_error(status.HTTP_400_BAD_REQUEST, error_msg) try: diff --git a/seahub/api2/endpoints/utils.py b/seahub/api2/endpoints/utils.py index da212a0b87..2106dd1c8b 100644 --- a/seahub/api2/endpoints/utils.py +++ b/seahub/api2/endpoints/utils.py @@ -2,7 +2,7 @@ import re import datetime import time -import urllib +import urllib.request, urllib.parse, urllib.error import logging from rest_framework import status @@ -79,7 +79,7 @@ def get_user_contact_email_dict(email_list): email_list = set(email_list) user_contact_email_dict = {} for email in email_list: - if not user_contact_email_dict.has_key(email): + if email not in user_contact_email_dict: user_contact_email_dict[email] = email2contact_email(email) return user_contact_email_dict @@ -88,7 +88,7 @@ def get_user_name_dict(email_list): email_list = set(email_list) user_name_dict = {} for email in email_list: - if not user_name_dict.has_key(email): + if email not in user_name_dict: user_name_dict[email] = email2nickname(email) return user_name_dict @@ -97,7 +97,7 @@ def get_repo_dict(repo_id_list): repo_id_list = set(repo_id_list) repo_dict = {} for repo_id in repo_id_list: - if not repo_dict.has_key(repo_id): + if repo_id not in repo_dict: repo_dict[repo_id] = '' repo = seafile_api.get_repo(repo_id) if repo: @@ -110,10 +110,10 @@ def get_group_dict(group_id_list): group_id_list = set(group_id_list) group_dict = {} for group_id in group_id_list: - if not group_dict.has_key(group_id): + if group_id not in group_dict: group_dict[group_id] = '' group = ccnet_api.get_group(int(group_id)) - print group + print(group) if group: group_dict[group_id] = group @@ -154,29 +154,29 @@ def generate_links_header_for_paginator(base_url, page, per_page, total_count, o else: return False - if type(option_dict) is not dict: + if not isinstance(option_dict, dict): return '' query_dict = {'page': 1, 'per_page': per_page} query_dict.update(option_dict) # generate first page url - first_page_url = base_url + '?' + urllib.urlencode(query_dict) + first_page_url = base_url + '?' + urllib.parse.urlencode(query_dict) # generate last page url last_page_query_dict = {'page': (total_count / per_page) + 1} query_dict.update(last_page_query_dict) - last_page_url = base_url + '?' + urllib.urlencode(query_dict) + last_page_url = base_url + '?' + urllib.parse.urlencode(query_dict) # generate next page url next_page_query_dict = {'page': page + 1} query_dict.update(next_page_query_dict) - next_page_url = base_url + '?' + urllib.urlencode(query_dict) + next_page_url = base_url + '?' + urllib.parse.urlencode(query_dict) # generate prev page url prev_page_query_dict = {'page': page - 1} query_dict.update(prev_page_query_dict) - prev_page_url = base_url + '?' + urllib.urlencode(query_dict) + prev_page_url = base_url + '?' + urllib.parse.urlencode(query_dict) # generate `Links` header links_header = '' diff --git a/seahub/api2/endpoints/wiki_pages.py b/seahub/api2/endpoints/wiki_pages.py index 5df9d5cb91..a98cd7235d 100644 --- a/seahub/api2/endpoints/wiki_pages.py +++ b/seahub/api2/endpoints/wiki_pages.py @@ -2,7 +2,7 @@ import os import logging -import urllib2 +import urllib.request, urllib.error, urllib.parse import posixpath from rest_framework import status @@ -61,13 +61,13 @@ class WikiPagesView(APIView): pages = get_wiki_pages(repo) wiki_pages_object = [] - for _, page_name in pages.iteritems(): + for _, page_name in pages.items(): wiki_page_object = get_wiki_page_object(wiki, page_name) wiki_pages_object.append(wiki_page_object) # sort pages by name - wiki_pages_object.sort(lambda x, y: cmp(x['name'].lower(), - y['name'].lower())) + wiki_pages_object.sort( + key=lambda x: x['name'].lower()) return Response({ "data": wiki_pages_object @@ -161,7 +161,7 @@ class WikiPageView(APIView): return api_error(status.HTTP_404_NOT_FOUND, error_msg) url = get_inner_file_url(repo, wiki_dirent.obj_id, wiki_dirent.obj_name) - file_response = urllib2.urlopen(url) + file_response = urllib.request.urlopen(url) content = file_response.read() wiki_page_object = get_wiki_page_object(wiki, page_name) @@ -332,7 +332,7 @@ class WikiPageContentView(APIView): return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) url = gen_inner_file_get_url(token, file_name) - file_response = urllib2.urlopen(url) + file_response = urllib.request.urlopen(url) content = file_response.read() try: diff --git a/seahub/api2/endpoints/wikis.py b/seahub/api2/endpoints/wikis.py index 1140c52ee6..7ebd7a0f35 100644 --- a/seahub/api2/endpoints/wikis.py +++ b/seahub/api2/endpoints/wikis.py @@ -47,7 +47,7 @@ class WikisView(APIView): rtype = request.GET.get('type', "") if not rtype: # set all to True, no filter applied - filter_by = filter_by.fromkeys(filter_by.iterkeys(), True) + filter_by = filter_by.fromkeys(iter(filter_by.keys()), True) for f in rtype.split(','): f = f.strip() diff --git a/seahub/api2/migrations/0001_initial.py b/seahub/api2/migrations/0001_initial.py index 4fa54fbb18..061796aaa6 100644 --- a/seahub/api2/migrations/0001_initial.py +++ b/seahub/api2/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:41 -from __future__ import unicode_literals + from django.db import migrations, models import django.utils.timezone @@ -41,6 +41,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='tokenv2', - unique_together=set([('user', 'platform', 'device_id')]), + unique_together={('user', 'platform', 'device_id')}, ), ] diff --git a/seahub/api2/models.py b/seahub/api2/models.py index d3c53aec68..22e9c5df16 100644 --- a/seahub/api2/models.py +++ b/seahub/api2/models.py @@ -4,6 +4,9 @@ import hmac import datetime from hashlib import sha1 +import operator +from functools import cmp_to_key + from django.db import models from django.utils import timezone @@ -27,7 +30,7 @@ class Token(models.Model): def generate_key(self): unique = str(uuid.uuid4()) - return hmac.new(unique, digestmod=sha1).hexdigest() + return hmac.new(unique.encode('utf-8'), digestmod=sha1).hexdigest() def __unicode__(self): return self.key @@ -72,13 +75,12 @@ class TokenV2Manager(models.Manager): the same category are listed by most recently used first ''' - ret = cmp(platform_priorities[d1.platform], platform_priorities[d2.platform]) - if ret != 0: - return ret + if operator.eq(platform_priorities[d1.platform], platform_priorities[d2.platform]): + return operator.lt(d2.last_accessed, d1.last_accessed) + else: + return operator.lt(platform_priorities[d1.platform], platform_priorities[d2.platform]) - return cmp(d2.last_accessed, d1.last_accessed) - - return [ d.as_dict() for d in sorted(devices, sort_devices) ] + return [ d.as_dict() for d in sorted(devices, key=cmp_to_key(sort_devices)) ] def _get_token_by_user_device(self, username, platform, device_id): try: @@ -172,11 +174,11 @@ class TokenV2(models.Model): def generate_key(self): unique = str(uuid.uuid4()) - return hmac.new(unique, digestmod=sha1).hexdigest() + return hmac.new(unique.encode('utf-8'), digestmod=sha1).hexdigest() def __unicode__(self): return "TokenV2{user=%(user)s,device=%(device_name)s}" % \ - dict(user=self.user,device_name=self.device_name) + dict(user=self.user, device_name=self.device_name) def is_desktop_client(self): return str(self.platform) in ('windows', 'linux', 'mac') diff --git a/seahub/api2/throttling.py b/seahub/api2/throttling.py index dd6fb66199..0c33668862 100644 --- a/seahub/api2/throttling.py +++ b/seahub/api2/throttling.py @@ -2,7 +2,7 @@ """ Provides various throttling policies. """ -from __future__ import unicode_literals + from django.conf import settings from django.core.cache import cache as default_cache from django.core.exceptions import ImproperlyConfigured diff --git a/seahub/api2/utils.py b/seahub/api2/utils.py index f0c9ea94e7..11b880933e 100644 --- a/seahub/api2/utils.py +++ b/seahub/api2/utils.py @@ -104,12 +104,12 @@ def get_groups(email): if len(msg) >= 1: mtime = get_timestamp(msg[0].timestamp) group = { - "id":g.id, - "name":g.group_name, - "creator":g.creator_name, - "ctime":g.timestamp, - "mtime":mtime, - "msgnum":grpmsgs[g.id], + "id": g.id, + "name": g.group_name, + "creator": g.creator_name, + "ctime": g.timestamp, + "mtime": mtime, + "msgnum": grpmsgs[g.id], } group_json.append(group) @@ -227,11 +227,11 @@ def group_msg_to_json(msg, get_all_replies): replies = [] for reply in msg.replies: r = { - 'from_email' : reply.from_email, - 'nickname' : email2nickname(reply.from_email), - 'timestamp' : get_timestamp(reply.timestamp), - 'msg' : reply.message, - 'msgid' : reply.id, + 'from_email': reply.from_email, + 'nickname': email2nickname(reply.from_email), + 'timestamp': get_timestamp(reply.timestamp), + 'msg': reply.message, + 'msgid': reply.id, } replies.append(r) diff --git a/seahub/api2/views.py b/seahub/api2/views.py index 7d5ab86e79..1ab9930542 100644 --- a/seahub/api2/views.py +++ b/seahub/api2/views.py @@ -9,7 +9,7 @@ import datetime import posixpath import re from dateutil.relativedelta import relativedelta -from urllib2 import quote +from urllib.parse import quote from rest_framework import parsers from rest_framework import status @@ -129,13 +129,13 @@ except ImportError: from pysearpc import SearpcError, SearpcObjEncoder import seaserv from seaserv import seafserv_threaded_rpc, \ - get_personal_groups_by_user, get_session_info, is_personal_repo, \ - get_repo, check_permission, get_commits, is_passwd_set,\ + get_personal_groups_by_user, is_personal_repo, \ + get_repo, check_permission, get_commits,\ check_quota, list_share_repos, get_group_repos_by_owner, get_group_repoids, \ remove_share, get_group, \ get_commit, get_file_id_by_path, MAX_DOWNLOAD_DIR_SIZE, edit_repo, \ ccnet_threaded_rpc, get_personal_groups, seafile_api, \ - create_org, ccnet_api, send_message + create_org, ccnet_api from constance import config @@ -345,11 +345,11 @@ class AccountInfo(APIView): if name is not None: if len(name) > 64: return api_error(status.HTTP_400_BAD_REQUEST, - _(u'Name is too long (maximum is 64 characters)')) + _('Name is too long (maximum is 64 characters)')) if "/" in name: return api_error(status.HTTP_400_BAD_REQUEST, - _(u"Name should not include '/'.")) + _("Name should not include '/'.")) email_interval = request.data.get("email_notification_interval", None) if email_interval is not None: @@ -524,7 +524,7 @@ class Search(APIView): suffixes = [] if len(custom_ftypes) > 0: for ftp in custom_ftypes: - if SEARCH_FILEEXT.has_key(ftp): + if ftp in SEARCH_FILEEXT: for ext in SEARCH_FILEEXT[ftp]: suffixes.append(ext) @@ -590,7 +590,7 @@ class Search(APIView): e['permission'] = permission # get repo type - if repo_type_map.has_key(repo_id): + if repo_id in repo_type_map: e['repo_type'] = repo_type_map[repo_id] else: e['repo_type'] = '' @@ -605,7 +605,7 @@ def repo_download_info(request, repo_id, gen_sync_token=True): return api_error(status.HTTP_404_NOT_FOUND, 'Library not found.') # generate download url for client - relay_id = get_session_info().id + relay_id = 0 addr, port = get_ccnet_server_addr_port() email = request.user.username if gen_sync_token: @@ -670,7 +670,7 @@ class Repos(APIView): rtype = request.GET.get('type', "") if not rtype: # set all to True, no filter applied - filter_by = filter_by.fromkeys(filter_by.iterkeys(), True) + filter_by = filter_by.fromkeys(iter(filter_by.keys()), True) for f in rtype.split(','): f = f.strip() @@ -695,14 +695,14 @@ class Repos(APIView): ret_corrupted=True) # Reduce memcache fetch ops. - modifiers_set = set([x.last_modifier for x in owned_repos]) + modifiers_set = {x.last_modifier for x in owned_repos} for e in modifiers_set: if e not in contact_email_dict: contact_email_dict[e] = email2contact_email(e) if e not in nickname_dict: nickname_dict[e] = email2nickname(e) - owned_repos.sort(lambda x, y: cmp(y.last_modify, x.last_modify)) + owned_repos.sort(key=lambda x: x.last_modify, reverse=True) for r in owned_repos: # do not return virtual repos if r.is_virtual: @@ -753,15 +753,15 @@ class Repos(APIView): get_repos_with_admin_permission(email) # Reduce memcache fetch ops. - owners_set = set([x.user for x in shared_repos]) - modifiers_set = set([x.last_modifier for x in shared_repos]) + owners_set = {x.user for x in shared_repos} + modifiers_set = {x.last_modifier for x in shared_repos} for e in owners_set | modifiers_set: if e not in contact_email_dict: contact_email_dict[e] = email2contact_email(e) if e not in nickname_dict: nickname_dict[e] = email2nickname(e) - shared_repos.sort(lambda x, y: cmp(y.last_modify, x.last_modify)) + shared_repos.sort(key=lambda x: x.last_modify, reverse=True) for r in shared_repos: if q and q.lower() not in r.name.lower(): continue @@ -775,7 +775,7 @@ class Repos(APIView): if not is_web_request(request): continue - r.password_need = is_passwd_set(r.repo_id, email) + r.password_need = seafile_api.is_password_set(r.repo_id, email) repo = { "type": "srepo", "id": r.repo_id, @@ -784,7 +784,6 @@ class Repos(APIView): "owner_contact_email": contact_email_dict.get(r.user, ''), "name": r.repo_name, "owner_nickname": nickname_dict.get(r.user, ''), - "owner_name": nickname_dict.get(r.user, ''), "mtime": r.last_modify, "mtime_relative": translate_seahub_time(r.last_modify), "modifier_email": r.last_modifier, @@ -816,11 +815,11 @@ class Repos(APIView): else: group_repos = seafile_api.get_group_repos_by_user(email) - group_repos.sort(lambda x, y: cmp(y.last_modify, x.last_modify)) + group_repos.sort(key=lambda x: x.last_modify, reverse=True) # Reduce memcache fetch ops. - share_from_set = set([x.user for x in group_repos]) - modifiers_set = set([x.last_modifier for x in group_repos]) + share_from_set = {x.user for x in group_repos} + modifiers_set = {x.last_modifier for x in group_repos} for e in modifiers_set | share_from_set: if e not in contact_email_dict: contact_email_dict[e] = email2contact_email(e) @@ -863,8 +862,8 @@ class Repos(APIView): public_repos = list_inner_pub_repos(request) # Reduce memcache fetch ops. - share_from_set = set([x.user for x in public_repos]) - modifiers_set = set([x.last_modifier for x in public_repos]) + share_from_set = {x.user for x in public_repos} + modifiers_set = {x.last_modifier for x in public_repos} for e in modifiers_set | share_from_set: if e not in contact_email_dict: contact_email_dict[e] = email2contact_email(e) @@ -906,7 +905,7 @@ class Repos(APIView): org_id = request.user.org.org_id try: - send_message('seahub.stats', 'user-login\t%s\t%s\t%s' % (email, timestamp, org_id)) + seafile_api.publish_event('seahub.stats', 'user-login\t%s\t%s\t%s' % (email, timestamp, org_id)) except Exception as e: logger.error('Error when sending user-login message: %s' % str(e)) response = HttpResponse(json.dumps(repos_json), status=200, @@ -985,7 +984,7 @@ class Repos(APIView): return None, api_error(status.HTTP_403_FORBIDDEN, 'NOT allow to create encrypted library.') - if org_id > 0: + if org_id and org_id > 0: repo_id = seafile_api.create_org_repo(repo_name, repo_desc, username, org_id, passwd, enc_version=settings.ENCRYPTED_LIBRARY_VERSION) @@ -1049,7 +1048,7 @@ class Repos(APIView): return None, api_error(status.HTTP_400_BAD_REQUEST, 'You must provide magic, random_key and enc_version.') - if org_id > 0: + if org_id and org_id > 0: repo_id = seafile_api.create_org_enc_repo(repo_id, repo_name, repo_desc, username, magic, random_key, salt, enc_version, org_id) @@ -1196,7 +1195,7 @@ def set_repo_password(request, repo, password): if ENABLE_RESET_ENCRYPTED_REPO_PASSWORD: add_encrypted_repo_secret_key_to_database(repo_id, password) - except SearpcError, e: + except SearpcError as e: if e.msg == 'Bad arguments': return api_error(status.HTTP_400_BAD_REQUEST, e.msg) elif e.msg == 'Repo is not encrypted': @@ -1254,14 +1253,14 @@ class Repo(APIView): root_id = current_commit.root_id if current_commit else None repo_json = { - "type":"repo", - "id":repo.id, - "owner":owner, - "name":repo.name, - "mtime":repo.latest_modify, - "size":repo.size, - "encrypted":repo.encrypted, - "root":root_id, + "type": "repo", + "id": repo.id, + "owner": owner, + "name": repo.name, + "mtime": repo.latest_modify, + "size": repo.size, + "encrypted": repo.encrypted, + "root": root_id, "permission": check_permission(repo.id, username), "modifier_email": repo.last_modifier, "modifier_contact_email": email2contact_email(repo.last_modifier), @@ -1583,7 +1582,7 @@ class RepoOwner(APIView): return api_error(status.HTTP_404_NOT_FOUND, error_msg) if org_id and not ccnet_api.org_user_exists(org_id, new_owner): - error_msg = _(u'User %s not found in organization.') % new_owner + error_msg = _('User %s not found in organization.') % new_owner return api_error(status.HTTP_404_NOT_FOUND, error_msg) # permission check @@ -1598,12 +1597,12 @@ class RepoOwner(APIView): return api_error(status.HTTP_403_FORBIDDEN, error_msg) if not new_owner_obj.permissions.can_add_repo(): - error_msg = _(u'Transfer failed: role of %s is %s, can not add library.') % \ + error_msg = _('Transfer failed: role of %s is %s, can not add library.') % \ (new_owner, new_owner_obj.role) return api_error(status.HTTP_403_FORBIDDEN, error_msg) if new_owner == repo_owner: - error_msg = _(u"Library can not be transferred to owner.") + error_msg = _("Library can not be transferred to owner.") return api_error(status.HTTP_400_BAD_REQUEST, error_msg) pub_repos = [] @@ -1741,7 +1740,7 @@ class FileBlockDownloadLinkView(APIView): 'You do not have permission to access this repo.') if check_quota(repo_id) < 0: - return api_error(HTTP_443_ABOVE_QUOTA, _(u"Out of quota.")) + return api_error(HTTP_443_ABOVE_QUOTA, _("Out of quota.")) token = seafile_api.get_fileserver_access_token( repo_id, file_id, 'downloadblks', request.user.username) @@ -1777,7 +1776,7 @@ class UploadLinkView(APIView): 'You do not have permission to access this folder.') if check_quota(repo_id) < 0: - return api_error(HTTP_443_ABOVE_QUOTA, _(u"Out of quota.")) + return api_error(HTTP_443_ABOVE_QUOTA, _("Out of quota.")) token = seafile_api.get_fileserver_access_token(repo_id, 'dummy', 'upload', request.user.username, use_onetime=False) @@ -1825,7 +1824,7 @@ class UpdateLinkView(APIView): 'You do not have permission to access this folder.') if check_quota(repo_id) < 0: - return api_error(HTTP_443_ABOVE_QUOTA, _(u"Out of quota.")) + return api_error(HTTP_443_ABOVE_QUOTA, _("Out of quota.")) token = seafile_api.get_fileserver_access_token(repo_id, 'dummy', 'update', request.user.username, use_onetime=False) @@ -1869,7 +1868,7 @@ class UploadBlksLinkView(APIView): 'You do not have permission to access this folder.') if check_quota(repo_id) < 0: - return api_error(HTTP_443_ABOVE_QUOTA, _(u"Out of quota.")) + return api_error(HTTP_443_ABOVE_QUOTA, _("Out of quota.")) token = seafile_api.get_fileserver_access_token(repo_id, 'dummy', 'upload-blks-api', request.user.username, use_onetime=False) @@ -1914,7 +1913,7 @@ class UploadBlksLinkView(APIView): 'You do not have permission to access this folder.') if check_quota(repo_id) < 0: - return api_error(HTTP_443_ABOVE_QUOTA, _(u"Out of quota.")) + return api_error(HTTP_443_ABOVE_QUOTA, _("Out of quota.")) token = seafile_api.get_fileserver_access_token(repo_id, 'dummy', 'upload', request.user.username, use_onetime=False) @@ -1962,7 +1961,7 @@ class UpdateBlksLinkView(APIView): 'You do not have permission to access this folder.') if check_quota(repo_id) < 0: - return api_error(HTTP_443_ABOVE_QUOTA, _(u"Out of quota.")) + return api_error(HTTP_443_ABOVE_QUOTA, _("Out of quota.")) token = seafile_api.get_fileserver_access_token(repo_id, 'dummy', 'update-blks-api', request.user.username, use_onetime=False) @@ -2012,7 +2011,7 @@ def get_dir_file_recursively(username, repo_id, path, all_dirs): file_list = [item for item in all_dirs if item['type'] == 'file'] contact_email_dict = {} nickname_dict = {} - modifiers_set = set([x['modifier_email'] for x in file_list]) + modifiers_set = {x['modifier_email'] for x in file_list} for e in modifiers_set: if e not in contact_email_dict: contact_email_dict[e] = email2contact_email(e) @@ -2042,7 +2041,7 @@ def get_dir_entrys_by_id(request, repo, path, dir_id, request_type=None): dirs = seafile_api.list_dir_with_perm(repo.id, path, dir_id, username, -1, -1) dirs = dirs if dirs else [] - except SearpcError, e: + except SearpcError as e: logger.error(e) return api_error(HTTP_520_OPERATION_FAILED, "Failed to list dir.") @@ -2084,7 +2083,7 @@ def get_dir_entrys_by_id(request, repo, path, dir_id, request_type=None): # Use dict to reduce memcache fetch cost in large for-loop. contact_email_dict = {} nickname_dict = {} - modifiers_set = set([x['modifier_email'] for x in file_list]) + modifiers_set = {x['modifier_email'] for x in file_list} for e in modifiers_set: if e not in contact_email_dict: contact_email_dict[e] = email2contact_email(e) @@ -2108,8 +2107,8 @@ def get_dir_entrys_by_id(request, repo, path, dir_id, request_type=None): if normalize_file_path(file_path) in starred_files: e['starred'] = True - dir_list.sort(lambda x, y: cmp(x['name'].lower(), y['name'].lower())) - file_list.sort(lambda x, y: cmp(x['name'].lower(), y['name'].lower())) + dir_list.sort(key=lambda x: x['name'].lower()) + file_list.sort(key=lambda x: x['name'].lower()) if request_type == 'f': dentrys = file_list @@ -2142,7 +2141,7 @@ def get_shared_link(request, repo_id, path): try: fs.save() - except IntegrityError, e: + except IntegrityError as e: return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, e.msg) http_or_https = request.is_secure() and 'https' or 'http' @@ -2207,7 +2206,7 @@ def get_repo_file(request, repo_id, file_id, file_name, op, def reloaddir(request, repo, parent_dir): try: dir_id = seafile_api.get_dir_id_by_path(repo.id, parent_dir) - except SearpcError, e: + except SearpcError as e: logger.error(e) return api_error(HTTP_520_OPERATION_FAILED, "Failed to get dir id by path") @@ -2260,7 +2259,7 @@ class OpDeleteView(APIView): allowed_file_names = [] locked_files = get_locked_files_by_dir(request, repo_id, parent_dir) for file_name in file_names.split(':'): - if file_name not in locked_files.keys(): + if file_name not in list(locked_files.keys()): # file is not locked allowed_file_names.append(file_name) elif locked_files[file_name] == username: @@ -2333,7 +2332,7 @@ class OpMoveView(APIView): allowed_obj_names = [] locked_files = get_locked_files_by_dir(request, repo_id, parent_dir) for file_name in obj_names.split(':'): - if file_name not in locked_files.keys(): + if file_name not in list(locked_files.keys()): # file is not locked allowed_obj_names.append(file_name) elif locked_files[file_name] == username: @@ -2373,7 +2372,7 @@ class OpMoveView(APIView): # check if above quota for dst repo if seafile_api.check_quota(dst_repo, total_size) < 0: - return api_error(HTTP_443_ABOVE_QUOTA, _(u"Out of quota.")) + return api_error(HTTP_443_ABOVE_QUOTA, _("Out of quota.")) # make new name dst_dirents = seafile_api.list_dir_by_path(dst_repo, dst_dir) @@ -2487,7 +2486,7 @@ class OpCopyView(APIView): # check if above quota for dst repo if seafile_api.check_quota(dst_repo, total_size) < 0: - return api_error(HTTP_443_ABOVE_QUOTA, _(u"Out of quota.")) + return api_error(HTTP_443_ABOVE_QUOTA, _("Out of quota.")) # make new name dst_dirents = seafile_api.list_dir_by_path(dst_repo, dst_dir) @@ -2849,7 +2848,7 @@ class FileView(APIView): try: seafile_api.rename_file(repo_id, parent_dir, oldname, newname, username) - except SearpcError,e: + except SearpcError as e: return api_error(HTTP_520_OPERATION_FAILED, "Failed to rename file: %s" % e) @@ -2892,7 +2891,7 @@ class FileView(APIView): dst_dir, new_filename, replace=False, username=username, need_progress=0, synchronous=1) - except SearpcError, e: + except SearpcError as e: return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, "SearpcError:" + e.msg) @@ -2984,7 +2983,7 @@ class FileView(APIView): try: seafile_api.post_empty_file(repo_id, parent_dir, new_file_name, username) - except SearpcError, e: + except SearpcError as e: return api_error(HTTP_520_OPERATION_FAILED, 'Failed to create file.') @@ -3038,7 +3037,7 @@ class FileView(APIView): try: seafile_api.lock_file(repo_id, path.lstrip('/'), username, expire) return Response('success', status=status.HTTP_200_OK) - except SearpcError, e: + except SearpcError as e: logger.error(e) return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Internal error') @@ -3052,7 +3051,7 @@ class FileView(APIView): try: seafile_api.unlock_file(repo_id, path.lstrip('/')) return Response('success', status=status.HTTP_200_OK) - except SearpcError, e: + except SearpcError as e: logger.error(e) return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Internal error') else: @@ -3617,7 +3616,7 @@ class DirView(APIView): resp = Response('success', status=status.HTTP_201_CREATED) uri = reverse('DirView', args=[repo_id], request=request) resp['Location'] = uri + '?p=' + quote( - parent_dir.encode('utf-8') + '/' + new_dir_name.encode('utf-8')) + parent_dir.encode('utf-8') + '/'.encode('utf-8') + new_dir_name.encode('utf-8')) return resp elif operation.lower() == 'rename': @@ -3646,7 +3645,7 @@ class DirView(APIView): seafile_api.rename_file(repo_id, parent_dir, old_dir_name, checked_newname, username) return Response('success', status=status.HTTP_200_OK) - except SearpcError, e: + except SearpcError as e: logger.error(e) return api_error(HTTP_520_OPERATION_FAILED, 'Failed to rename folder.') @@ -3786,13 +3785,13 @@ class DirSubRepoView(APIView): error_msg = 'Bad arguments' return api_error(status.HTTP_400_BAD_REQUEST, error_msg) elif e.msg == 'Incorrect password': - error_msg = _(u'Wrong password') + error_msg = _('Wrong password') return api_error(status.HTTP_400_BAD_REQUEST, error_msg) elif e.msg == 'Internal server error': - error_msg = _(u'Internal server error') + error_msg = _('Internal server error') return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) else: - error_msg = _(u'Decrypt library error') + error_msg = _('Decrypt library error') return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) # create sub-lib for encrypted repo @@ -3883,7 +3882,7 @@ class BeSharedRepos(APIView): shared_repos.append(r) if not CLOUD_MODE: - shared_repos += seaserv.list_inner_pub_repos(username) + shared_repos += seafile_api.get_inner_pub_repo_list() return HttpResponse(json.dumps(shared_repos, cls=SearpcObjEncoder), status=200, content_type=json_content_type) @@ -3960,7 +3959,7 @@ class SharedFileDetailView(APIView): file_id = seafile_api.get_file_id_by_path(repo_id, path) commits = get_file_revisions_after_renamed(repo_id, path) c = commits[0] - except SearpcError, e: + except SearpcError as e: return api_error(HTTP_520_OPERATION_FAILED, "Failed to get file id by path.") @@ -4089,7 +4088,7 @@ class SharedDirView(APIView): dirs = seafserv_threaded_rpc.list_dir_with_perm(repo_id, real_path, dir_id, username, -1, -1) dirs = dirs if dirs else [] - except SearpcError, e: + except SearpcError as e: logger.error(e) return api_error(HTTP_520_OPERATION_FAILED, "Failed to list dir.") @@ -4115,8 +4114,8 @@ class SharedDirView(APIView): else: file_list.append(entry) - dir_list.sort(lambda x, y: cmp(x['name'].lower(), y['name'].lower())) - file_list.sort(lambda x, y: cmp(x['name'].lower(), y['name'].lower())) + dir_list.sort(key=lambda x: x['name'].lower()) + file_list.sort(key=lambda x: x['name'].lower()) dentrys = dir_list + file_list content_type = 'application/json; charset=utf-8' @@ -4298,7 +4297,7 @@ class SharedRepo(APIView): try: seafile_api.share_repo(repo_id, username, u, permission) shared_users.append(u) - except SearpcError, e: + except SearpcError as e: logger.error(e) notsharable_errors.append(e) @@ -4313,7 +4312,7 @@ class SharedRepo(APIView): for s_user in shared_users: try: remove_share(repo_id, username, s_user) - except SearpcError, e: + except SearpcError as e: # ignoring this error, go to next unsharing continue @@ -4348,7 +4347,7 @@ class SharedRepo(APIView): try: seafile_api.set_group_repo(repo_id, group_id, username, permission) - except SearpcError, e: + except SearpcError as e: return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, "Searpc Error: " + e.msg) try: @@ -4555,7 +4554,7 @@ class Groups(APIView): group_id = ccnet_api.create_group(group_name, username) return HttpResponse(json.dumps({'success': True, 'group_id': group_id}), content_type=content_type) - except SearpcError, e: + except SearpcError as e: result['error'] = e.msg return HttpResponse(json.dumps(result), status=500, content_type=content_type) @@ -4648,7 +4647,7 @@ class GroupMembers(APIView): try: ccnet_threaded_rpc.group_add_member(group.id, request.user.username, user_name) - except SearpcError, e: + except SearpcError as e: return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Unable to add user to group') return HttpResponse(json.dumps({'success': True}), status=200, content_type=json_content_type) @@ -4673,7 +4672,7 @@ class GroupMembers(APIView): try: ccnet_threaded_rpc.group_remove_member(group.id, request.user.username, user_name) - except SearpcError, e: + except SearpcError as e: return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, 'Unable to add user to group') return HttpResponse(json.dumps({'success': True}), status=200, content_type=json_content_type) @@ -4783,14 +4782,14 @@ class GroupRepos(APIView): else: repos = seafile_api.get_repos_by_group(group.id) - repos.sort(lambda x, y: cmp(y.last_modified, x.last_modified)) + repos.sort(key=lambda x: x.last_modified, reverse=True) group.is_staff = is_group_staff(group, request.user) # Use dict to reduce memcache fetch cost in large for-loop. contact_email_dict = {} nickname_dict = {} - owner_set = set([x.user for x in repos]) - modifiers_set = set([x.modifier for x in repos]) + owner_set = {x.user for x in repos} + modifiers_set = {x.modifier for x in repos} for e in owner_set | modifiers_set: if e not in contact_email_dict: contact_email_dict[e] = email2contact_email(e) @@ -4949,7 +4948,7 @@ class OfficeConvertQueryStatus(APIView): else: ret['success'] = True ret['status'] = d.status - except Exception, e: + except Exception as e: logging.exception('failed to call query_office_convert_status') ret['error'] = str(e) diff --git a/seahub/auth/__init__.py b/seahub/auth/__init__.py index 3cbfe9bf64..a1ea5ca7f0 100644 --- a/seahub/auth/__init__.py +++ b/seahub/auth/__init__.py @@ -19,9 +19,9 @@ def load_backend(path): module, attr = path[:i], path[i+1:] try: mod = import_module(module) - except ImportError, e: + except ImportError as e: raise ImproperlyConfigured('Error importing authentication backend %s: "%s"' % (module, e)) - except ValueError, e: + except ValueError as e: raise ImproperlyConfigured('Error importing authentication backends. Is AUTHENTICATION_BACKENDS a correctly defined list or tuple?') try: cls = getattr(mod, attr) diff --git a/seahub/auth/backends.py b/seahub/auth/backends.py index 518a590034..d5aad32c05 100644 --- a/seahub/auth/backends.py +++ b/seahub/auth/backends.py @@ -194,7 +194,7 @@ class SeafileRemoteUserBackend(AuthBackend): """ user_info = {} - for header, user_info_key in self.remote_user_attribute_map.items(): + for header, user_info_key in list(self.remote_user_attribute_map.items()): value = request.META.get(header, None) if value: user_info[user_info_key] = value diff --git a/seahub/auth/forms.py b/seahub/auth/forms.py index c60e01e28e..e959af2f98 100644 --- a/seahub/auth/forms.py +++ b/seahub/auth/forms.py @@ -112,7 +112,7 @@ class PasswordResetForm(forms.Form): Validates that a user exists with the given e-mail address. """ if not IS_EMAIL_CONFIGURED: - raise forms.ValidationError(_(u'Failed to send email, email service is not properly configured, please contact administrator.')) + raise forms.ValidationError(_('Failed to send email, email service is not properly configured, please contact administrator.')) email = self.cleaned_data["email"].lower().strip() diff --git a/seahub/auth/middleware.py b/seahub/auth/middleware.py index 31d59892a9..d1ae0d8a86 100644 --- a/seahub/auth/middleware.py +++ b/seahub/auth/middleware.py @@ -122,7 +122,7 @@ class SeafileRemoteUserMiddleware(MiddlewareMixin): if not user: if not getattr(settings, 'REMOTE_USER_CREATE_UNKNOWN_USER', True): return render(request, 'remote_user/create_unknown_user_false.html') - return render(request, 'remote_user/error.html') + return render(request, 'remote_user/error.html') if user: if not user.is_active: diff --git a/seahub/auth/models.py b/seahub/auth/models.py index bf4bdcb714..b8e984788e 100644 --- a/seahub/auth/models.py +++ b/seahub/auth/models.py @@ -1,7 +1,7 @@ # Copyright (c) 2012-2016 Seafile Ltd. import datetime import hashlib -import urllib +import urllib.request, urllib.parse, urllib.error import logging # import auth @@ -21,7 +21,7 @@ def get_hexdigest(algorithm, salt, raw_password): Returns a string of the hexdigest of the given plaintext password and salt using the given algorithm ('md5', 'sha1' or 'crypt'). """ - raw_password, salt = smart_str(raw_password), smart_str(salt) + raw_password, salt = smart_str(raw_password).encode('utf-8'), smart_str(salt).encode('utf-8') if algorithm == 'crypt': try: import crypt @@ -65,7 +65,7 @@ class AnonymousUser(object): return 'AnonymousUser' def __str__(self): - return unicode(self).encode('utf-8') + return str(self).encode('utf-8') def __eq__(self, other): return isinstance(other, self.__class__) @@ -156,7 +156,7 @@ class SocialAuthUser(models.Model): class Meta: """Meta data""" - app_label = "seahub.work_weixin" + app_label = "base" unique_together = ('provider', 'uid') db_table = 'social_auth_usersocialauth' diff --git a/seahub/auth/tokens.py b/seahub/auth/tokens.py index c307dfc575..823cba4ae1 100644 --- a/seahub/auth/tokens.py +++ b/seahub/auth/tokens.py @@ -72,7 +72,7 @@ class PasswordResetTokenGenerator(object): return "%s-%s" % (ts_b36, hash) def _num_days(self, dt): - return (dt - date(2001,1,1)).days + return (dt - date(2001, 1, 1)).days def _today(self): # Used for mocking in tests diff --git a/seahub/auth/views.py b/seahub/auth/views.py index 68c8e56e60..edf5caa626 100644 --- a/seahub/auth/views.py +++ b/seahub/auth/views.py @@ -217,7 +217,7 @@ def login_simple_check(request): raise Http404 today = datetime.now().strftime('%Y-%m-%d') - expect = hashlib.md5(settings.SECRET_KEY+username+today).hexdigest() + expect = hashlib.md5((settings.SECRET_KEY+username+today).encode('utf-8')).hexdigest() if expect == random_key: try: user = User.objects.get(email=username) @@ -313,9 +313,9 @@ def password_reset(request, is_admin_site=False, template_name='registration/pas opts['domain_override'] = get_current_site(request).domain try: form.save(**opts) - except Exception, e: + except Exception as e: logger.error(str(e)) - messages.error(request, _(u'Failed to send email, please contact administrator.')) + messages.error(request, _('Failed to send email, please contact administrator.')) return render(request, template_name, { 'form': form, }) diff --git a/seahub/avatar/forms.py b/seahub/avatar/forms.py index 274b6b9256..f58fabad39 100644 --- a/seahub/avatar/forms.py +++ b/seahub/avatar/forms.py @@ -16,7 +16,7 @@ def avatar_img(avatar, size): if not avatar.thumbnail_exists(size): avatar.create_thumbnail(size) return mark_safe("""%s""" % - (avatar.avatar_url(size), unicode(avatar), size, size)) + (avatar.avatar_url(size), str(avatar), size, size)) class UploadAvatarForm(forms.Form): @@ -40,7 +40,7 @@ class UploadAvatarForm(forms.Form): if AVATAR_MAX_AVATARS_PER_USER > 1 and \ count >= AVATAR_MAX_AVATARS_PER_USER: raise forms.ValidationError( - _(u"You already have %(nb_avatars)d avatars, and the maximum allowed is %(nb_max_avatars)d.") % + _("You already have %(nb_avatars)d avatars, and the maximum allowed is %(nb_max_avatars)d.") % { 'nb_avatars' : count, 'nb_max_avatars' : AVATAR_MAX_AVATARS_PER_USER}) return diff --git a/seahub/avatar/management/commands/migrate_avatars_fs2db.py b/seahub/avatar/management/commands/migrate_avatars_fs2db.py index 84238ffe04..46555fb8a1 100644 --- a/seahub/avatar/management/commands/migrate_avatars_fs2db.py +++ b/seahub/avatar/management/commands/migrate_avatars_fs2db.py @@ -32,9 +32,9 @@ class Command(BaseCommand): for avatar in Avatar.objects.all(): try: self._save(avatar.avatar.name, avatar.avatar) - print "SUCCESS: migrated Avatar path=%s user=%s" % (avatar.avatar.name, avatar.emailuser) + print("SUCCESS: migrated Avatar path=%s user=%s" % (avatar.avatar.name, avatar.emailuser)) except AvatarNotFoundError: - print "ERROR: Avatar file not found: path=%s user=%s. Skip." % (avatar.avatar.name, avatar.emailuser) + print("ERROR: Avatar file not found: path=%s user=%s. Skip." % (avatar.avatar.name, avatar.emailuser)) continue # try: @@ -50,10 +50,10 @@ class Command(BaseCommand): in the name will be converted to forward '/'. """ name = name.replace('\\', '/') - name_md5 = hashlib.md5(name).hexdigest() + name_md5 = hashlib.md5(name.encode('utf-8')).hexdigest() try: binary = content.read() - except AttributeError, IOError: + except AttributeError as IOError: raise AvatarNotFoundError size = len(binary) @@ -78,7 +78,7 @@ class Command(BaseCommand): return name def exists(self, name): - name_md5 = hashlib.md5(name).hexdigest() + name_md5 = hashlib.md5(name.encode('utf-8')).hexdigest() query = 'SELECT COUNT(*) FROM %(table)s WHERE %(name_md5_column)s = %%s' query %= self.__dict__ cursor = connection.cursor() diff --git a/seahub/avatar/management/commands/rebuild_avatars.py b/seahub/avatar/management/commands/rebuild_avatars.py index dcb5d3bcfb..320c241922 100644 --- a/seahub/avatar/management/commands/rebuild_avatars.py +++ b/seahub/avatar/management/commands/rebuild_avatars.py @@ -11,5 +11,5 @@ class Command(BaseCommand): def handle(self, **options): for avatar in Avatar.objects.all(): for size in AUTO_GENERATE_AVATAR_SIZES: - print "Rebuilding Avatar id=%s at size %s." % (avatar.id, size) + print("Rebuilding Avatar id=%s at size %s." % (avatar.id, size)) avatar.create_thumbnail(size) diff --git a/seahub/avatar/migrations/0001_initial.py b/seahub/avatar/migrations/0001_initial.py index ca8294d931..00861692fb 100644 --- a/seahub/avatar/migrations/0001_initial.py +++ b/seahub/avatar/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:42 -from __future__ import unicode_literals + import datetime from django.db import migrations, models diff --git a/seahub/avatar/models.py b/seahub/avatar/models.py index 7c159c1bc4..748bbd437b 100644 --- a/seahub/avatar/models.py +++ b/seahub/avatar/models.py @@ -14,10 +14,10 @@ from django.utils.encoding import smart_str from django.db.models import signals try: - from cStringIO import StringIO - dir(StringIO) # Placate PyFlakes + from io import BytesIO + dir(BytesIO) # Placate PyFlakes except ImportError: - from StringIO import StringIO + from io import BytesIO try: from PIL import Image @@ -39,7 +39,7 @@ def avatar_file_path(instance=None, filename=None, size=None, ext=None): if isinstance(instance, Avatar): tmppath = [AVATAR_STORAGE_DIR] if AVATAR_HASH_USERDIRNAMES: - tmp = hashlib.md5(instance.emailuser).hexdigest() + tmp = hashlib.md5(instance.emailuser.encode('utf-8')).hexdigest() tmppath.extend([tmp[0], tmp[1], tmp[2:]]) else: tmppath.append(instance.emailuser) @@ -63,7 +63,7 @@ def avatar_file_path(instance=None, filename=None, size=None, ext=None): # File doesn't exist yet if AVATAR_HASH_FILENAMES: (root, ext) = os.path.splitext(filename) - filename = hashlib.md5(smart_str(filename)).hexdigest() + filename = hashlib.md5(smart_str(filename).encode('utf-8')).hexdigest() filename = filename + ext if size: tmppath.extend(['resized', str(size)]) @@ -92,7 +92,7 @@ class AvatarBase(object): try: orig = self.avatar.storage.open(self.avatar.name, 'rb').read() - image = Image.open(StringIO(orig)) + image = Image.open(BytesIO(orig)) quality = quality or AVATAR_THUMB_QUALITY (w, h) = image.size @@ -106,7 +106,7 @@ class AvatarBase(object): if image.mode != "RGBA": image = image.convert("RGBA") image = image.resize((size, size), AVATAR_RESIZE_METHOD) - thumb = StringIO() + thumb = BytesIO() image.save(thumb, AVATAR_THUMB_FORMAT, quality=quality) thumb_file = ContentFile(thumb.getvalue()) else: @@ -141,7 +141,7 @@ class Avatar(models.Model, AvatarBase): date_uploaded = models.DateTimeField(default=datetime.datetime.now) def __unicode__(self): - return _(u'Avatar for %s') % self.emailuser + return _('Avatar for %s') % self.emailuser def save(self, *args, **kwargs): avatars = Avatar.objects.filter(emailuser=self.emailuser) @@ -169,7 +169,7 @@ class GroupAvatar(models.Model, AvatarBase): date_uploaded = models.DateTimeField(default=datetime.datetime.now) def __unicode__(self): - return _(u'Avatar for %s') % self.group_id + return _('Avatar for %s') % self.group_id def save(self, *args, **kwargs): super(GroupAvatar, self).save(*args, **kwargs) diff --git a/seahub/avatar/templatetags/avatar_tags.py b/seahub/avatar/templatetags/avatar_tags.py index fe6fd8d035..f2c9f4c804 100644 --- a/seahub/avatar/templatetags/avatar_tags.py +++ b/seahub/avatar/templatetags/avatar_tags.py @@ -1,8 +1,8 @@ # Copyright (c) 2012-2016 Seafile Ltd. import logging -import urllib +import urllib.request, urllib.parse, urllib.error import hashlib -from urlparse import urlparse +from urllib.parse import urlparse from django import template from django.core.urlresolvers import reverse @@ -34,8 +34,8 @@ def avatar_url(user, size=AVATAR_DEFAULT_SIZE): if AVATAR_GRAVATAR_DEFAULT: params['d'] = AVATAR_GRAVATAR_DEFAULT return "http://www.gravatar.com/avatar/%s/?%s" % ( - hashlib.md5(user.email).hexdigest(), - urllib.urlencode(params)) + hashlib.md5(user.email.encode('utf-8')).hexdigest(), + urllib.parse.urlencode(params)) else: url = get_default_avatar_url() diff --git a/seahub/avatar/tests.py b/seahub/avatar/tests.py index 7168d7205b..f2ed371760 100644 --- a/seahub/avatar/tests.py +++ b/seahub/avatar/tests.py @@ -39,8 +39,8 @@ class AvatarTestCase(TestCase): 'password': 'testpassword', }, ) - self.assertEquals(response.status_code, 302) - self.assert_(response['Location'].endswith(settings.LOGIN_REDIRECT_URL)) + self.assertEqual(response.status_code, 302) + self.assertTrue(response['Location'].endswith(settings.LOGIN_REDIRECT_URL)) Image.init() @@ -50,38 +50,38 @@ class AvatarTestCase(TestCase): class AvatarUploadTests(AvatarTestCase): def testNonImageUpload(self): response = upload_helper(self, "nonimagefile") - self.failUnlessEqual(response.status_code, 200) - self.failIfEqual(response.context['upload_avatar_form'].errors, {}) + self.assertEqual(response.status_code, 200) + self.assertNotEqual(response.context['upload_avatar_form'].errors, {}) def testNormalImageUpload(self): response = upload_helper(self, "test.png") - self.failUnlessEqual(response.status_code, 200) - self.failUnlessEqual(len(response.redirect_chain), 1) - self.failUnlessEqual(response.context['upload_avatar_form'].errors, {}) + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response.redirect_chain), 1) + self.assertEqual(response.context['upload_avatar_form'].errors, {}) avatar = get_primary_avatar(self.user) - self.failIfEqual(avatar, None) + self.assertNotEqual(avatar, None) def testImageWithoutExtension(self): # use with AVATAR_ALLOWED_FILE_EXTS = ('.jpg', '.png') response = upload_helper(self, "imagefilewithoutext") - self.failUnlessEqual(response.status_code, 200) - self.failUnlessEqual(len(response.redirect_chain), 0) # Redirect only if it worked - self.failIfEqual(response.context['upload_avatar_form'].errors, {}) + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response.redirect_chain), 0) # Redirect only if it worked + self.assertNotEqual(response.context['upload_avatar_form'].errors, {}) def testImageWithWrongExtension(self): # use with AVATAR_ALLOWED_FILE_EXTS = ('.jpg', '.png') response = upload_helper(self, "imagefilewithwrongext.ogg") - self.failUnlessEqual(response.status_code, 200) - self.failUnlessEqual(len(response.redirect_chain), 0) # Redirect only if it worked - self.failIfEqual(response.context['upload_avatar_form'].errors, {}) + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response.redirect_chain), 0) # Redirect only if it worked + self.assertNotEqual(response.context['upload_avatar_form'].errors, {}) def testImageTooBig(self): # use with AVATAR_MAX_SIZE = 1024 * 1024 response = upload_helper(self, "testbig.png") - self.failUnlessEqual(response.status_code, 200) - self.failUnlessEqual(len(response.redirect_chain), 0) # Redirect only if it worked - self.failIfEqual(response.context['upload_avatar_form'].errors, {}) + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response.redirect_chain), 0) # Redirect only if it worked + self.assertNotEqual(response.context['upload_avatar_form'].errors, {}) def testDefaultUrl(self): response = self.client.get(reverse('avatar_render_primary', kwargs={ @@ -97,13 +97,13 @@ class AvatarUploadTests(AvatarTestCase): def testNonExistingUser(self): a = get_primary_avatar("nonexistinguser@mail.com") - self.failUnlessEqual(a, None) + self.assertEqual(a, None) def testThereCanBeOnlyOnePrimaryAvatar(self): for i in range(1, 10): self.testNormalImageUpload() count = Avatar.objects.filter(emailuser=self.user, primary=True).count() - self.failUnlessEqual(count, 1) + self.assertEqual(count, 1) # def testDeleteAvatar(self): # self.testNormalImageUpload() diff --git a/seahub/avatar/views.py b/seahub/avatar/views.py index 2373c57b1c..9ec8c1af0e 100644 --- a/seahub/avatar/views.py +++ b/seahub/avatar/views.py @@ -34,11 +34,11 @@ def _get_next(request): 3. If Django can determine the previous page from the HTTP headers, the view will redirect to that previous page. """ - next = request.POST.get('next', request.GET.get('next', + next_page = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None))) - if not next: - next = request.path - return next + if not next_page: + next_page = request.path + return next_page def _get_avatars(user): # Default set. Needs to be sliced, but that's it. Keep the natural order. @@ -148,10 +148,10 @@ def delete(request, extra_context=None, next_override=None, *args, **kwargs): if request.method == 'POST': if delete_avatar_form.is_valid(): ids = delete_avatar_form.cleaned_data['choices'] - if unicode(avatar.id) in ids and avatars.count() > len(ids): + if str(avatar.id) in ids and avatars.count() > len(ids): # Find the next best avatar, and set it as the new primary for a in avatars: - if unicode(a.id) not in ids: + if str(a.id) not in ids: a.primary = True a.save() avatar_updated.send(sender=Avatar, user=request.user, avatar=avatar) diff --git a/seahub/base/accounts.py b/seahub/base/accounts.py index 4ebbb98c4d..aaaa067e44 100644 --- a/seahub/base/accounts.py +++ b/seahub/base/accounts.py @@ -11,7 +11,7 @@ from django.utils.translation import ugettext_lazy as _ from django.conf import settings from django.contrib.sites.shortcuts import get_current_site import seaserv -from seaserv import ccnet_threaded_rpc, unset_repo_passwd, is_passwd_set, \ +from seaserv import ccnet_threaded_rpc, unset_repo_passwd, \ seafile_api, ccnet_api from constance import config from registration import signals @@ -89,14 +89,14 @@ class UserManager(object): def get(self, email=None, id=None): if not email and not id: - raise User.DoesNotExist, 'User matching query does not exits.' + raise User.DoesNotExist('User matching query does not exits.') if email: emailuser = ccnet_threaded_rpc.get_emailuser(email) if id: emailuser = ccnet_threaded_rpc.get_emailuser_by_id(id) if not emailuser: - raise User.DoesNotExist, 'User matching query does not exits.' + raise User.DoesNotExist('User matching query does not exits.') user = User(emailuser.email) user.id = emailuser.id @@ -510,7 +510,7 @@ class User(object): passwd_setted_repos = [] for r in owned_repos + shared_repos + groups_repos + public_repos: if not has_repo(passwd_setted_repos, r) and r.encrypted and \ - is_passwd_set(r.id, self.email): + seafile_api.is_password_set(r.id, self.email): passwd_setted_repos.append(r) for r in passwd_setted_repos: @@ -532,7 +532,7 @@ class User(object): passwd_setted_repos = [] for r in owned_repos + shared_repos + groups_repos + public_repos: if not has_repo(passwd_setted_repos, r) and r.encrypted and \ - is_passwd_set(r.id, self.email): + seafile_api.is_password_set(r.id, self.email): passwd_setted_repos.append(r) for r in passwd_setted_repos: @@ -543,7 +543,7 @@ class AuthBackend(object): def get_user_with_import(self, username): emailuser = seaserv.get_emailuser_with_import(username) if not emailuser: - raise User.DoesNotExist, 'User matching query does not exits.' + raise User.DoesNotExist('User matching query does not exits.') user = User(emailuser.email) user.id = emailuser.id diff --git a/seahub/base/apps.py b/seahub/base/apps.py index d6f6c6adac..e14d19a75b 100644 --- a/seahub/base/apps.py +++ b/seahub/base/apps.py @@ -14,6 +14,6 @@ class BaseConfig(AppConfig): try: _ = list(FileComment.objects.all()[:1].values('uuid_id')) except: - print ''' + print(''' Warning: File comment has changed since version 6.3, while table `base_filecomment` is not migrated yet, please consider migrate it according to v6.3.0 release note, otherwise the file comment feature will not work correctly. - ''' + ''') diff --git a/seahub/base/database_storage/__init__.py b/seahub/base/database_storage/__init__.py index 19adf1f5eb..cc6ec93718 100644 --- a/seahub/base/database_storage/__init__.py +++ b/seahub/base/database_storage/__init__.py @@ -2,4 +2,4 @@ # Allow users to: from database_storage import DatabaseStorage # (reduce redundancy a little bit) -from database_storage import * +from .database_storage import * diff --git a/seahub/base/database_storage/database_storage.py b/seahub/base/database_storage/database_storage.py index 2a50de1200..94c58bf7e0 100644 --- a/seahub/base/database_storage/database_storage.py +++ b/seahub/base/database_storage/database_storage.py @@ -10,8 +10,8 @@ from django.db import connection, transaction import base64 import hashlib -import StringIO -import urlparse +import io +import urllib.parse from datetime import datetime from seahub.utils.timeutils import value_to_db_datetime @@ -137,7 +137,7 @@ class DatabaseStorage(Storage): """ assert mode == 'rb', "DatabaseStorage open mode must be 'rb'." - name_md5 = hashlib.md5(name).hexdigest() + name_md5 = hashlib.md5(name.encode('utf-8')).hexdigest() query = 'SELECT %(data_column)s FROM %(table)s ' + \ 'WHERE %(name_md5_column)s = %%s' @@ -148,7 +148,7 @@ class DatabaseStorage(Storage): if row is None: return None - inMemFile = StringIO.StringIO(base64.b64decode(row[0])) + inMemFile = io.BytesIO(base64.b64decode(row[0])) inMemFile.name = name inMemFile.mode = mode @@ -160,7 +160,7 @@ class DatabaseStorage(Storage): in the name will be converted to forward '/'. """ name = name.replace('\\', '/') - name_md5 = hashlib.md5(name).hexdigest() + name_md5 = hashlib.md5(name.encode('utf-8')).hexdigest() binary = content.read() size = len(binary) @@ -185,7 +185,7 @@ class DatabaseStorage(Storage): return name def exists(self, name): - name_md5 = hashlib.md5(name).hexdigest() + name_md5 = hashlib.md5(name.encode('utf-8')).hexdigest() query = 'SELECT COUNT(*) FROM %(table)s WHERE %(name_md5_column)s = %%s' query %= self.__dict__ cursor = connection.cursor() @@ -196,7 +196,7 @@ class DatabaseStorage(Storage): def delete(self, name): if self.exists(name): with transaction.atomic(using='default'): - name_md5 = hashlib.md5(name).hexdigest() + name_md5 = hashlib.md5(name.encode('utf-8')).hexdigest() query = 'DELETE FROM %(table)s WHERE %(name_md5_column)s = %%s' query %= self.__dict__ connection.cursor().execute(query, [name_md5]) @@ -207,12 +207,12 @@ class DatabaseStorage(Storage): def url(self, name): if self.base_url is None: raise ValueError("This file is not accessible via a URL.") - result = urlparse.urljoin(self.base_url, name).replace('\\', '/') + result = urllib.parse.urljoin(self.base_url, name).replace('\\', '/') return result def size(self, name): "Get the size of the given filename or raise ObjectDoesNotExist." - name_md5 = hashlib.md5(name).hexdigest() + name_md5 = hashlib.md5(name.encode('utf-8')).hexdigest() query = 'SELECT %(size_column)s FROM %(table)s ' + \ 'WHERE %(name_md5_column)s = %%s' query %= self.__dict__ @@ -226,7 +226,7 @@ class DatabaseStorage(Storage): def modified_time(self, name): "Get the modified time of the given filename or raise ObjectDoesNotExist." - name_md5 = hashlib.md5(name).hexdigest() + name_md5 = hashlib.md5(name.encode('utf-8')).hexdigest() query = 'SELECT %(mtime_column)s FROM %(table)s ' + \ 'WHERE %(name_md5_column)s = %%s' query %= self.__dict__ diff --git a/seahub/base/decorators.py b/seahub/base/decorators.py index 49ebf5b393..7e5b06c486 100644 --- a/seahub/base/decorators.py +++ b/seahub/base/decorators.py @@ -4,7 +4,7 @@ from django.http import Http404, HttpResponseRedirect, HttpResponseNotAllowed from django.shortcuts import render from django.utils.http import urlquote -from seaserv import get_repo, is_passwd_set +from seaserv import get_repo, seafile_api from seahub.options.models import UserOptions, CryptoOptionNotSetError @@ -49,7 +49,7 @@ def repo_passwd_set_required(func): def _decorated(request, *args, **kwargs): repo_id = kwargs.get('repo_id', None) if not repo_id: - raise Exception, 'Repo id is not found in url.' + raise Exception('Repo id is not found in url.') repo = get_repo(repo_id) if not repo: raise Http404 @@ -62,14 +62,14 @@ def repo_passwd_set_required(func): }) if (repo.enc_version == 1 or (repo.enc_version == 2 and server_crypto)) \ - and not is_passwd_set(repo_id, username): + and not seafile_api.is_password_set(repo_id, username): return render(request, 'decrypt_repo_form.html', { 'repo': repo, 'next': request.get_full_path(), }) if repo.enc_version == 2 and not server_crypto: - return render_error(request, _(u'Files in this library can not be viewed online.')) + return render_error(request, _('Files in this library can not be viewed online.')) return func(request, *args, **kwargs) return _decorated diff --git a/seahub/base/fields.py b/seahub/base/fields.py index 83de5a8e07..5956dc9f08 100644 --- a/seahub/base/fields.py +++ b/seahub/base/fields.py @@ -15,7 +15,7 @@ class ModifyingFieldDescriptor(object): class LowerCaseCharField(CharField): def to_python(self, value): value = super(LowerCaseCharField, self).to_python(value) - if isinstance(value, basestring): + if isinstance(value, str): return value.lower() return value def contribute_to_class(self, cls, name): diff --git a/seahub/base/generic.py b/seahub/base/generic.py index fefe731a2d..cbcbb396a8 100644 --- a/seahub/base/generic.py +++ b/seahub/base/generic.py @@ -12,7 +12,7 @@ class DirectTemplateView(TemplateView): def get_context_data(self, **kwargs): context = super(self.__class__, self).get_context_data(**kwargs) if self.extra_context is not None: - for key, value in self.extra_context.items(): + for key, value in list(self.extra_context.items()): if callable(value): context[key] = value() else: diff --git a/seahub/base/management/commands/changepassword.py b/seahub/base/management/commands/changepassword.py index c6e6df4171..a7bfd9ca05 100644 --- a/seahub/base/management/commands/changepassword.py +++ b/seahub/base/management/commands/changepassword.py @@ -28,7 +28,7 @@ class Command(BaseCommand): except User.DoesNotExist: raise CommandError("user '%s' does not exist" % username) - print "Changing password for user '%s'" % u.username + print("Changing password for user '%s'" % u.username) MAX_TRIES = 3 count = 0 @@ -37,7 +37,7 @@ class Command(BaseCommand): p1 = self._get_pass() p2 = self._get_pass("Password (again): ") if p1 != p2: - print "Passwords do not match. Please try again." + print("Passwords do not match. Please try again.") count = count + 1 if count == MAX_TRIES: diff --git a/seahub/base/management/commands/clear_invalid_repo_data.py b/seahub/base/management/commands/clear_invalid_repo_data.py index 3a6301ba72..73fe5a39f6 100644 --- a/seahub/base/management/commands/clear_invalid_repo_data.py +++ b/seahub/base/management/commands/clear_invalid_repo_data.py @@ -27,7 +27,7 @@ class Command(BaseCommand): 'ExtraSharePermission': ExtraSharePermission, 'UploadLinkShare': UploadLinkShare} - for table in self.tables.items(): + for table in list(self.tables.items()): self.clear_table(table[0], table[1]) self.stdout.write('All invalid repo data are deleted') diff --git a/seahub/base/management/commands/createsuperuser.py b/seahub/base/management/commands/createsuperuser.py index 8d6b02882e..7dba7ac650 100644 --- a/seahub/base/management/commands/createsuperuser.py +++ b/seahub/base/management/commands/createsuperuser.py @@ -118,9 +118,9 @@ class Command(BaseCommand): # username = None # Get an email - while 1: + while True: if not email: - email = raw_input('E-mail address: ') + email = input('E-mail address: ') try: is_valid_email(email) except exceptions.ValidationError: @@ -130,7 +130,7 @@ class Command(BaseCommand): break # Get a password - while 1: + while True: if not password: password = getpass.getpass() password2 = getpass.getpass('Password (again): ') @@ -148,4 +148,4 @@ class Command(BaseCommand): sys.exit(1) User.objects.create_superuser(email, password) - print "Superuser created successfully." + print("Superuser created successfully.") diff --git a/seahub/base/management/commands/export_file_access_log.py b/seahub/base/management/commands/export_file_access_log.py index 437bcbe07e..785f0c14fd 100644 --- a/seahub/base/management/commands/export_file_access_log.py +++ b/seahub/base/management/commands/export_file_access_log.py @@ -62,7 +62,7 @@ class Command(BaseCommand): repo_obj_dict = {} repo_owner_dict = {} - events.sort(lambda x, y: cmp(y.timestamp, x.timestamp)) + events.sort(key=lambda x: x.timestamp, reverse=True) for ev in events: event_type, ev.show_device = generate_file_audit_event_type(ev) diff --git a/seahub/base/management/commands/migrate_file_comment.py b/seahub/base/management/commands/migrate_file_comment.py index 49f91554e9..9d9a64a2f1 100644 --- a/seahub/base/management/commands/migrate_file_comment.py +++ b/seahub/base/management/commands/migrate_file_comment.py @@ -24,19 +24,19 @@ class Command(BaseCommand): elif 'sqlite' in engine: sqlite = True else: - print 'Unsupported database. Exit.' + print('Unsupported database. Exit.') return - print 'Start to update schema...' + print('Start to update schema...') comments = list(FileComment.objects.raw('SELECT * from base_filecomment')) with connection.cursor() as cursor: sql = 'ALTER TABLE base_filecomment RENAME TO base_filecomment_backup_%s' % (random_key()) cursor.execute(sql) - print sql + print(sql) - print '' + print('') if mysql: sql = '''CREATE TABLE `base_filecomment` ( @@ -54,23 +54,23 @@ class Command(BaseCommand): ''' % (random_key(), random_key(), random_key()) cursor.execute(sql) - print sql + print(sql) if sqlite: sql = '''CREATE TABLE "base_filecomment" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "author" varchar(255) NOT NULL, "comment" text NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "uuid_id" char(32) NOT NULL REFERENCES "tags_fileuuidmap" ("uuid")) ''' cursor.execute(sql) - print sql + print(sql) sql = '''CREATE INDEX "base_filecomment_%s" ON "base_filecomment" ("author")''' % random_key() cursor.execute(sql) - print sql + print(sql) sql = '''CREATE INDEX "base_filecomment_%s" ON "base_filecomment" ("uuid_id") ''' % random_key() cursor.execute(sql) - print sql + print(sql) - print 'Start to migate comments data...' + print('Start to migate comments data...') for c in comments: repo_id = c.repo_id parent_path = c.parent_path @@ -83,15 +83,15 @@ class Command(BaseCommand): uuid = FileUUIDMap.objects.get_or_create_fileuuidmap(repo_id, parent_path, filename, False) FileComment(uuid=uuid, author=author, comment=comment, created_at=created_at, updated_at=updated_at).save() - print 'migrated comment ID: %d' % c.pk + print('migrated comment ID: %d' % c.pk) - print 'Done' + print('Done') def handle(self, *args, **options): # check table column `uuid` try: res = FileComment.objects.raw('SELECT uuid_id from base_filecomment limit 1') if 'uuid_id' in res.columns: - print 'base_filecomment is already migrated, exit.' + print('base_filecomment is already migrated, exit.') except OperationalError: self.migrate_schema() diff --git a/seahub/base/middleware.py b/seahub/base/middleware.py index 9dd61c0429..7771070d91 100644 --- a/seahub/base/middleware.py +++ b/seahub/base/middleware.py @@ -185,7 +185,7 @@ class UserPermissionMiddleware(object): request_path = request.path def get_permission_by_request_path(request_path, permission_url): - for permission, url_list in permission_url.iteritems(): + for permission, url_list in permission_url.items(): for url in url_list: if url in request_path: return permission diff --git a/seahub/base/migrations/0001_initial.py b/seahub/base/migrations/0001_initial.py index 027abf1b99..82ae95bc98 100644 --- a/seahub/base/migrations/0001_initial.py +++ b/seahub/base/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:42 -from __future__ import unicode_literals + import datetime from django.db import migrations, models @@ -126,6 +126,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='devicetoken', - unique_together=set([('token', 'user')]), + unique_together={('token', 'user')}, ), ] diff --git a/seahub/base/migrations/0002_reposecretkey.py b/seahub/base/migrations/0002_reposecretkey.py index ca1ef5a595..a1e2e0c556 100644 --- a/seahub/base/migrations/0002_reposecretkey.py +++ b/seahub/base/migrations/0002_reposecretkey.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-07-10 09:33 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/base/migrations/0003_auto_20181016_1242.py b/seahub/base/migrations/0003_auto_20181016_1242.py index e7b14f5d2d..40b3c7a80b 100644 --- a/seahub/base/migrations/0003_auto_20181016_1242.py +++ b/seahub/base/migrations/0003_auto_20181016_1242.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-10-16 12:42 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/base/models.py b/seahub/base/models.py index 440d158be4..cb1f3e57ca 100644 --- a/seahub/base/models.py +++ b/seahub/base/models.py @@ -15,7 +15,7 @@ from seahub.utils import calc_file_path_hash, within_time_range, \ normalize_file_path, normalize_dir_path from seahub.utils.timeutils import datetime_to_isoformat_timestr from seahub.tags.models import FileUUIDMap -from fields import LowerCaseCharField +from .fields import LowerCaseCharField # Get an instance of a logger @@ -192,7 +192,7 @@ class UserStarredFilesManager(models.Manager): repo_cache = {} for sfile in starred_files: # repo still exists? - if repo_cache.has_key(sfile.repo_id): + if sfile.repo_id in repo_cache: repo = repo_cache[sfile.repo_id] else: try: @@ -241,7 +241,7 @@ class UserStarredFilesManager(models.Manager): logger.error(e) sfile.last_modified = 0 - ret.sort(lambda x, y: cmp(y.last_modified, x.last_modified)) + ret.sort(key=lambda x: x.last_modified, reverse=True) return ret diff --git a/seahub/base/profile.py b/seahub/base/profile.py index 79b52191dc..14f0e3c919 100644 --- a/seahub/base/profile.py +++ b/seahub/base/profile.py @@ -26,10 +26,10 @@ THE SOFTWARE. try: import cProfile as profile except ImportError: - import profile + from . import profile import pstats -from cStringIO import StringIO +from io import StringIO from django.conf import settings class ProfilerMiddleware(object): diff --git a/seahub/base/templatetags/rest_framework.py b/seahub/base/templatetags/rest_framework.py index 91a0dcc971..100f3e72d9 100644 --- a/seahub/base/templatetags/rest_framework.py +++ b/seahub/base/templatetags/rest_framework.py @@ -2,10 +2,10 @@ from django import template from django.core.urlresolvers import reverse from django.http import QueryDict -from django.utils.encoding import force_unicode +from django.utils.encoding import force_text from django.utils.html import escape from django.utils.safestring import SafeData, mark_safe -from urlparse import urlsplit, urlunsplit +from urllib.parse import urlsplit, urlunsplit import re import string @@ -97,7 +97,7 @@ def add_class(value, css_class): In the case of REST Framework, the filter is used to add Bootstrap-specific classes to the forms. """ - html = unicode(value) + html = str(value) match = class_re.search(html) if match: m = re.search(r'^%s$|^%s\s|\s%s\s|\s%s$' % (css_class, css_class, @@ -131,7 +131,7 @@ def urlize_quoted_links(text, trim_url_limit=None, nofollow=True, autoescape=Tru """ trim_url = lambda x, limit=trim_url_limit: limit is not None and (len(x) > limit and ('%s...' % x[:max(0, limit - 3)])) or x safe_input = isinstance(text, SafeData) - words = word_split_re.split(force_unicode(text)) + words = word_split_re.split(force_text(text)) nofollow_attr = nofollow and ' rel="nofollow"' or '' for i, word in enumerate(words): match = None @@ -167,4 +167,4 @@ def urlize_quoted_links(text, trim_url_limit=None, nofollow=True, autoescape=Tru words[i] = mark_safe(word) elif autoescape: words[i] = escape(word) - return mark_safe(u''.join(words)) + return mark_safe(''.join(words)) diff --git a/seahub/base/templatetags/seahub_tags.py b/seahub/base/templatetags/seahub_tags.py index 5eec58846b..12e6b3de94 100644 --- a/seahub/base/templatetags/seahub_tags.py +++ b/seahub/base/templatetags/seahub_tags.py @@ -53,23 +53,23 @@ FILEEXT_ICON_MAP = { 'txt': 'txt.png', # pdf file - 'pdf' : 'pdf.png', + 'pdf': 'pdf.png', # document file - 'doc' : 'word.png', - 'docx' : 'word.png', - 'odt' : 'word.png', - 'fodt' : 'word.png', + 'doc': 'word.png', + 'docx': 'word.png', + 'odt': 'word.png', + 'fodt': 'word.png', - 'ppt' : 'ppt.png', - 'pptx' : 'ppt.png', - 'odp' : 'ppt.png', - 'fodp' : 'ppt.png', + 'ppt': 'ppt.png', + 'pptx': 'ppt.png', + 'odp': 'ppt.png', + 'fodp': 'ppt.png', - 'xls' : 'excel.png', - 'xlsx' : 'excel.png', - 'ods' : 'excel.png', - 'fods' : 'excel.png', + 'xls': 'excel.png', + 'xlsx': 'excel.png', + 'ods': 'excel.png', + 'fods': 'excel.png', # video 'mp4': 'video.png', @@ -81,25 +81,25 @@ FILEEXT_ICON_MAP = { 'rmvb': 'video.png', # music file - 'mp3' : 'music.png', - 'oga' : 'music.png', - 'ogg' : 'music.png', - 'flac' : 'music.png', - 'aac' : 'music.png', - 'ac3' : 'music.png', - 'wma' : 'music.png', + 'mp3': 'music.png', + 'oga': 'music.png', + 'ogg': 'music.png', + 'flac': 'music.png', + 'aac': 'music.png', + 'ac3': 'music.png', + 'wma': 'music.png', # image file - 'jpg' : 'pic.png', - 'jpeg' : 'pic.png', - 'png' : 'pic.png', - 'svg' : 'pic.png', - 'gif' : 'pic.png', - 'bmp' : 'pic.png', - 'ico' : 'pic.png', + 'jpg': 'pic.png', + 'jpeg': 'pic.png', + 'png': 'pic.png', + 'svg': 'pic.png', + 'gif': 'pic.png', + 'bmp': 'pic.png', + 'ico': 'pic.png', # default - 'default' : 'file.png', + 'default': 'file.png', } @register.filter(name='file_icon_filter') def file_icon_filter(value, size=None): @@ -109,7 +109,7 @@ def file_icon_filter(value, size=None): else: file_ext = None - if file_ext and FILEEXT_ICON_MAP.has_key(file_ext): + if file_ext and file_ext in FILEEXT_ICON_MAP: if size == 192: return '192/' + FILEEXT_ICON_MAP.get(file_ext) else: @@ -122,17 +122,17 @@ def file_icon_filter(value, size=None): # This way of translation looks silly, but works well. COMMIT_MSG_TRANSLATION_MAP = { - 'Added' : _('Added'), - 'Deleted' : _('Deleted'), - 'Removed' : _('Removed'), - 'Modified' : _('Modified'), - 'Renamed' : _('Renamed'), - 'Moved' : _('Moved'), - 'Added directory' : _('Added directory'), - 'Removed directory' : _('Removed directory'), - 'Renamed directory' : _('Renamed directory'), - 'Moved directory' : _('Moved directory'), - 'Added or modified' : _('Added or modified'), + 'Added': _('Added'), + 'Deleted': _('Deleted'), + 'Removed': _('Removed'), + 'Modified': _('Modified'), + 'Renamed': _('Renamed'), + 'Moved': _('Moved'), + 'Added directory': _('Added directory'), + 'Removed directory': _('Removed directory'), + 'Renamed directory': _('Renamed directory'), + 'Moved directory': _('Moved directory'), + 'Added or modified': _('Added or modified'), } @register.filter(name='translate_commit_desc') def translate_commit_desc(value): @@ -164,7 +164,7 @@ def translate_commit_desc(value): else: # Use regular expression to translate commit description. # Commit description has two forms, e.g., 'Added "foo.txt" and 3 more files.' or 'Added "foo.txt".' - operations = '|'.join(COMMIT_MSG_TRANSLATION_MAP.keys()) + operations = '|'.join(list(COMMIT_MSG_TRANSLATION_MAP.keys())) patt = r'(%s) "(.*)"\s?(and ([0-9]+) more (files|directories))?' % operations ret_list = [] @@ -186,14 +186,14 @@ def translate_commit_desc(value): if has_more: if translation.get_language() == 'zh-cn': - typ = u'文件' if more_type == 'files' else u'目录' - ret = op_trans + u' "' + file_name + u'"以及另外' + n_files + u'个' + typ + '.' + typ = '文件' if more_type == 'files' else '目录' + ret = op_trans + ' "' + file_name + '"以及另外' + n_files + '个' + typ + '.' # elif translation.get_language() == 'ru': # ret = ... else: ret = e else: - ret = op_trans + u' "' + file_name + u'".' + ret = op_trans + ' "' + file_name + '".' ret_list.append(ret) return '\n'.join(ret_list) @@ -235,7 +235,7 @@ def translate_commit_desc_escape(value): else: # Use regular expression to translate commit description. # Commit description has two forms, e.g., 'Added "foo.txt" and 3 more files.' or 'Added "foo.txt".' - operations = '|'.join(COMMIT_MSG_TRANSLATION_MAP.keys()) + operations = '|'.join(list(COMMIT_MSG_TRANSLATION_MAP.keys())) patt = r'(%s) "(.*)"\s?(and ([0-9]+) more (files|directories))?' % operations for e in value.split('\n'): @@ -258,14 +258,14 @@ def translate_commit_desc_escape(value): if has_more: if translation.get_language() == 'zh-cn': - typ = u'文件' if more_type == 'files' else u'目录' - ret = op_trans + u' "' + file_name + u'"以及另外' + n_files + u'个' + typ + '.' + typ = '文件' if more_type == 'files' else '目录' + ret = op_trans + ' "' + file_name + '"以及另外' + n_files + '个' + typ + '.' # elif translation.get_language() == 'ru': # ret = ... else: ret = e else: - ret = op_trans + u' "' + file_name + u'".' + ret = op_trans + ' "' + file_name + '".' # if not match, this commit desc will not convert link, so # escape it @@ -278,7 +278,7 @@ def translate_commit_desc_escape(value): @register.filter(name='translate_seahub_time') def translate_seahub_time(value, autoescape=None): - if isinstance(value, int) or isinstance(value, long): # check whether value is int + if isinstance(value, int) or isinstance(value, int): # check whether value is int try: val = datetime.fromtimestamp(value) # convert timestamp to datetime except ValueError as e: @@ -461,9 +461,9 @@ def char2pinyin(value): @register.filter(name='translate_permission') def translate_permission(value): if value == 'rw': - return _(u'Read-Write') + return _('Read-Write') elif value == 'r': - return _(u'Read-Only') + return _('Read-Only') else: return '' diff --git a/seahub/base/utils.py b/seahub/base/utils.py index d578579760..263b4bbda2 100644 --- a/seahub/base/utils.py +++ b/seahub/base/utils.py @@ -3,7 +3,7 @@ import re import string from django.utils.safestring import SafeData, mark_safe -from django.utils.encoding import force_unicode +from django.utils.encoding import force_text from django.utils.functional import allow_lazy from django.utils.http import urlquote @@ -21,8 +21,8 @@ def escape(html): """ Returns the given HTML with ampersands, quotes and angle brackets encoded. """ - return mark_safe(force_unicode(html).replace('&', '&').replace('<', '<').replace('>', '>').replace('"', '"').replace("'", ''')) -escape = allow_lazy(escape, unicode) + return mark_safe(force_text(html).replace('&', '&').replace('<', '<').replace('>', '>').replace('"', '"').replace("'", ''')) +escape = allow_lazy(escape, str) ## modification of django's urlize, add '%' to safe: ## urlquote('http://%s' % middle, safe='/&=:;#?+*%') @@ -47,7 +47,7 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False): """ trim_url = lambda x, limit=trim_url_limit: limit is not None and (len(x) > limit and ('%s...' % x[:max(0, limit - 3)])) or x safe_input = isinstance(text, SafeData) - words = word_split_re.split(force_unicode(text)) + words = word_split_re.split(force_text(text)) nofollow_attr = nofollow and ' rel="nofollow"' or '' for i, word in enumerate(words): match = None @@ -83,5 +83,5 @@ def urlize(text, trim_url_limit=None, nofollow=False, autoescape=False): words[i] = mark_safe(word) elif autoescape: words[i] = escape(word) - return u''.join(words) -urlize = allow_lazy(urlize, unicode) + return ''.join(words) +urlize = allow_lazy(urlize, str) diff --git a/seahub/bisheng_office/utils.py b/seahub/bisheng_office/utils.py index af4e9b550f..0347c3a1b5 100644 --- a/seahub/bisheng_office/utils.py +++ b/seahub/bisheng_office/utils.py @@ -2,7 +2,7 @@ import hmac import base64 import hashlib -import urlparse +import urllib.parse from django.core.urlresolvers import reverse from django.utils.encoding import force_bytes @@ -14,7 +14,7 @@ from seahub.bisheng_office.settings import BISHENG_OFFICE_HOST_DOMAIN def get_hmac_hexdigest(key, msg): - hmac_obj = hmac.new(key, msg) + hmac_obj = hmac.new(key.encode('utf-8'), msg.encode('utf-8')) return hmac_obj.hexdigest() @@ -22,7 +22,7 @@ def get_bisheng_dict(username, repo_id, file_path): doc_id = hashlib.md5(force_bytes(repo_id + file_path)).hexdigest() base_url = get_site_scheme_and_netloc() - bisheng_url = urlparse.urljoin(base_url, + bisheng_url = urllib.parse.urljoin(base_url, reverse('api-v2.1-bisheng-office')) bisheng_url += '?doc_id=%s' % doc_id diff --git a/seahub/bisheng_office/views.py b/seahub/bisheng_office/views.py index 16a43958de..47a52d6b97 100644 --- a/seahub/bisheng_office/views.py +++ b/seahub/bisheng_office/views.py @@ -4,7 +4,7 @@ import os import json import copy import logging -import urlparse +import urllib.parse import requests from rest_framework import status @@ -166,7 +166,7 @@ class BishengOfficeView(APIView): # get content of new editted file data = post_data.get('data') - file_url = urlparse.urljoin(BISHENG_OFFICE_HOST_DOMAIN, data.get('docURL')) + file_url = urllib.parse.urljoin(BISHENG_OFFICE_HOST_DOMAIN, data.get('docURL')) files = { 'file': requests.get(file_url).content, 'file_name': os.path.basename(file_path), diff --git a/seahub/cconvert.py b/seahub/cconvert.py index 65733fad58..d80a5b8e84 100644 --- a/seahub/cconvert.py +++ b/seahub/cconvert.py @@ -15,7 +15,7 @@ ##################################### # python. -import sys,os +import sys, os import re import string class CConvert: @@ -25,12 +25,12 @@ class CConvert: self.spliter = '-' "Load data table" try: - fp=open(os.path.join(os.path.dirname(__file__), 'convert-utf-8.txt')) + fp=open(os.path.join(os.path.dirname(__file__), 'convert-utf-8.txt'), encoding='utf-8') except IOError: - print "Can't load data from convert-utf-8.txt\nPlease make sure this file exists." + print("Can't load data from convert-utf-8.txt\nPlease make sure this file exists.") sys.exit(1) else: - self.data=fp.read().decode("utf-8")# decoded data to unicode + self.data=fp.read() # decoded data to unicode fp.close() def convert1(self, strIn): @@ -95,7 +95,7 @@ class CConvert: else: if not self.has_shengdiao: p = p[:-1] pinyin += self.spliter + p + self.spliter - pinyin = pinyin.replace(' ','') \ - .replace(self.spliter+self.spliter,self.spliter) \ - .strip(self.spliter+' ').replace(self.spliter+self.spliter,self.spliter) + pinyin = pinyin.replace(' ', '') \ + .replace(self.spliter+self.spliter, self.spliter) \ + .strip(self.spliter+' ').replace(self.spliter+self.spliter, self.spliter) return pinyin diff --git a/seahub/contacts/migrations/0001_initial.py b/seahub/contacts/migrations/0001_initial.py index 261e6cdb0b..f29724cef5 100644 --- a/seahub/contacts/migrations/0001_initial.py +++ b/seahub/contacts/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:42 -from __future__ import unicode_literals + from django.db import migrations, models import seahub.base.fields diff --git a/seahub/contacts/models.py b/seahub/contacts/models.py index 81f0eed0d4..0cdeb2259c 100644 --- a/seahub/contacts/models.py +++ b/seahub/contacts/models.py @@ -9,7 +9,7 @@ from django.core.exceptions import MultipleObjectsReturned from seaserv import ccnet_threaded_rpc from seahub.base.fields import LowerCaseCharField -from settings import CONTACT_EMAIL_LENGTH +from .settings import CONTACT_EMAIL_LENGTH class ContactManager(models.Manager): def add_contact(self, user_email, contact_email, contact_name=None, note=None): diff --git a/seahub/contacts/urls.py b/seahub/contacts/urls.py index a6cfcde259..a807819134 100644 --- a/seahub/contacts/urls.py +++ b/seahub/contacts/urls.py @@ -1,7 +1,7 @@ # Copyright (c) 2012-2016 Seafile Ltd. from django.conf.urls import url -from views import * +from .views import * urlpatterns = [ diff --git a/seahub/contacts/views.py b/seahub/contacts/views.py index 9be8db5f8c..82be8852c1 100644 --- a/seahub/contacts/views.py +++ b/seahub/contacts/views.py @@ -12,12 +12,11 @@ from django.forms.models import modelformset_factory from django.contrib import messages from django.utils.translation import ugettext as _ -from models import Contact, ContactAddForm, ContactEditForm +from .models import Contact, ContactAddForm, ContactEditForm from seahub.auth.decorators import login_required, login_required_ajax from seahub.base.decorators import user_mods_check from seahub.profile.models import Profile from seahub.utils import render_error, is_valid_email -from seaserv import ccnet_rpc, ccnet_threaded_rpc from seahub.views import is_registered_user from seahub.settings import SITE_ROOT @@ -65,12 +64,12 @@ def contact_add(request): contact_email = request.POST.get('contact_email', '') if not is_valid_email(contact_email): result['success'] = False - messages.error(request, _(u"%s is not a valid email.") % contact_email) + messages.error(request, _("%s is not a valid email.") % contact_email) return HttpResponseBadRequest(json.dumps(result), content_type=content_type) if Contact.objects.get_contact_by_user(username, contact_email) is not None: result['success'] = False - messages.error(request, _(u"%s is already in your contacts.") % contact_email) + messages.error(request, _("%s is already in your contacts.") % contact_email) return HttpResponseBadRequest(json.dumps(result), content_type=content_type) contact_name = request.POST.get('contact_name', '') @@ -79,12 +78,12 @@ def contact_add(request): try: Contact.objects.add_contact(username, contact_email, contact_name, note) result['success'] = True - messages.success(request, _(u"Successfully added %s to contacts.") % contact_email) + messages.success(request, _("Successfully added %s to contacts.") % contact_email) return HttpResponse(json.dumps(result), content_type=content_type) except Exception as e: logger.error(e) result['success'] = False - messages.error(request, _(u"Failed to add %s to contacts.") % contact_email) + messages.error(request, _("Failed to add %s to contacts.") % contact_email) return HttpResponse(json.dumps(result), status=500, content_type=content_type) @login_required_ajax @@ -105,7 +104,7 @@ def contact_edit(request): contact.note = note contact.save() result['success'] = True - messages.success(request, _(u'Successfully edited %s.') % contact_email) + messages.success(request, _('Successfully edited %s.') % contact_email) return HttpResponse(json.dumps(result), content_type=content_type) else: return HttpResponseBadRequest(json.dumps(form.errors), @@ -118,6 +117,6 @@ def contact_delete(request): contact_email = request.GET.get('email') Contact.objects.filter(user_email=user_email, contact_email=contact_email).delete() - messages.success(request, _(u'Successfully Deleted %s') % contact_email) + messages.success(request, _('Successfully Deleted %s') % contact_email) return HttpResponseRedirect(reverse("contact_list")) diff --git a/seahub/drafts/apps.py b/seahub/drafts/apps.py index 1ff055c4d7..2620014c5e 100644 --- a/seahub/drafts/apps.py +++ b/seahub/drafts/apps.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.apps import AppConfig diff --git a/seahub/drafts/migrations/0001_initial.py b/seahub/drafts/migrations/0001_initial.py index d43664bfa3..5c6e3e4d75 100644 --- a/seahub/drafts/migrations/0001_initial.py +++ b/seahub/drafts/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-11-10 06:21 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/seahub/drafts/migrations/0002_draftreview_author.py b/seahub/drafts/migrations/0002_draftreview_author.py index afab487295..eace6093c3 100644 --- a/seahub/drafts/migrations/0002_draftreview_author.py +++ b/seahub/drafts/migrations/0002_draftreview_author.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-11-20 02:59 -from __future__ import unicode_literals + from django.db import migrations import seahub.base.fields diff --git a/seahub/drafts/migrations/0003_auto_20190301_0648.py b/seahub/drafts/migrations/0003_auto_20190301_0648.py index 8c9f957271..170255583d 100644 --- a/seahub/drafts/migrations/0003_auto_20190301_0648.py +++ b/seahub/drafts/migrations/0003_auto_20190301_0648.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2019-03-01 06:48 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/seahub/drafts/migrations/0004_auto_20190610_0628.py b/seahub/drafts/migrations/0004_auto_20190610_0628.py index 1e4e26d588..35d87ecc6a 100644 --- a/seahub/drafts/migrations/0004_auto_20190610_0628.py +++ b/seahub/drafts/migrations/0004_auto_20190610_0628.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2019-06-10 06:28 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/drafts/models.py b/seahub/drafts/models.py index 7e05b1e908..9f5dc6bad5 100644 --- a/seahub/drafts/models.py +++ b/seahub/drafts/models.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + import os import posixpath import uuid diff --git a/seahub/drafts/utils.py b/seahub/drafts/utils.py index 3b58f1601c..566a183503 100644 --- a/seahub/drafts/utils.py +++ b/seahub/drafts/utils.py @@ -4,7 +4,6 @@ import logging import posixpath from seaserv import seafile_api -from seaserv import send_message from seahub.utils import normalize_file_path, check_filename_with_rename from seahub.tags.models import FileUUIDMap @@ -15,7 +14,7 @@ logger = logging.getLogger(__name__) def create_user_draft_repo(username, org_id=-1): repo_name = 'Drafts' - if org_id > 0: + if org_id and org_id > 0: repo_id = seafile_api.create_org_repo(repo_name, '', username, org_id) else: repo_id = seafile_api.create_repo(repo_name, '', username) @@ -121,9 +120,8 @@ def send_draft_publish_msg(draft, username, path): old_path = draft.draft_file_path msg = '%s\t%s\t%s\t%s\t%s\t%s' % ("publish", "draft", repo_id, username, path, old_path) - msg_utf8 = msg.encode('utf-8') try: - send_message('seahub.draft', msg_utf8) + seafile_api.publish_event('seahub.draft', msg) except Exception as e: logger.error("Error when sending draft publish message: %s" % str(e)) diff --git a/seahub/drafts/views.py b/seahub/drafts/views.py index 32696e8925..92afc96493 100644 --- a/seahub/drafts/views.py +++ b/seahub/drafts/views.py @@ -28,7 +28,7 @@ def draft(request, pk): origin_repo_id = d.origin_repo_id permission = check_folder_permission(request, origin_repo_id, '/') if not permission: - return render_permission_error(request, _(u'Permission denied.')) + return render_permission_error(request, _('Permission denied.')) origin_file_path = posixpath.join(uuid.parent_path, uuid.filename) origin_file = seafile_api.get_file_id_by_path(origin_repo_id, origin_file_path) diff --git a/seahub/dtable/apps.py b/seahub/dtable/apps.py index 37a046bc54..7d328d04da 100644 --- a/seahub/dtable/apps.py +++ b/seahub/dtable/apps.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.apps import AppConfig diff --git a/seahub/dtable/migrations/0001_initial.py b/seahub/dtable/migrations/0001_initial.py index 8990e505f8..87df2b717b 100644 --- a/seahub/dtable/migrations/0001_initial.py +++ b/seahub/dtable/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2019-06-25 05:37 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion @@ -50,6 +50,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='dtables', - unique_together=set([('workspace', 'name')]), + unique_together={('workspace', 'name')}, ), ] diff --git a/seahub/dtable/migrations/0002_auto.py b/seahub/dtable/migrations/0002_auto.py index d5a9467dc2..032efad536 100644 --- a/seahub/dtable/migrations/0002_auto.py +++ b/seahub/dtable/migrations/0002_auto.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2019-07-02 05:20 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion @@ -28,6 +28,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='dtableshare', - unique_together=set([('dtable', 'to_user')]), + unique_together={('dtable', 'to_user')}, ), ] diff --git a/seahub/dtable/models.py b/seahub/dtable/models.py index 77076bf5e6..27bca8cdf8 100644 --- a/seahub/dtable/models.py +++ b/seahub/dtable/models.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + import uuid from django.db import models diff --git a/seahub/dtable/views.py b/seahub/dtable/views.py index 4795a094a3..f55500bbaa 100644 --- a/seahub/dtable/views.py +++ b/seahub/dtable/views.py @@ -41,20 +41,20 @@ def dtable_file_view(request, workspace_id, name): dtable = DTables.objects.get_dtable(workspace, name) if not dtable: - return render_error(request, _(u'Table does not exist')) + return render_error(request, _('Table does not exist')) table_file_name = name + FILE_TYPE table_path = normalize_file_path(table_file_name) table_file_id = seafile_api.get_file_id_by_path(repo_id, table_path) if not table_file_id: - return render_error(request, _(u'Table does not exist')) + return render_error(request, _('Table does not exist')) # permission check username = request.user.username owner = workspace.owner if not check_dtable_permission(username, owner) and \ not check_dtable_share_permission(dtable, username): - return render_permission_error(request, _(u'Permission denied.')) + return render_permission_error(request, _('Permission denied.')) return_dict = { 'share_link_expire_days_default': SHARE_LINK_EXPIRE_DAYS_DEFAULT, @@ -109,7 +109,7 @@ def dtable_asset_access(request, workspace_id, dtable_id, path): owner = workspace.owner if not check_dtable_permission(username, owner) and \ check_dtable_share_permission(dtable, username) not in WRITE_PERMISSION_TUPLE: - return render_permission_error(request, _(u'Permission denied.')) + return render_permission_error(request, _('Permission denied.')) dl = request.GET.get('dl', '0') == '1' operation = 'download' if dl else 'view' diff --git a/seahub/file_participants/migrations/0001_initial.py b/seahub/file_participants/migrations/0001_initial.py new file mode 100644 index 0000000000..e6a90c8fdd --- /dev/null +++ b/seahub/file_participants/migrations/0001_initial.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.23 on 2019-08-28 02:07 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import seahub.base.fields + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('tags', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='FileParticipant', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('username', seahub.base.fields.LowerCaseCharField(max_length=255)), + ('uuid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tags.FileUUIDMap')), + ], + ), + migrations.AlterUniqueTogether( + name='fileparticipant', + unique_together=set([('uuid', 'username')]), + ), + ] diff --git a/seahub/social_core/__init__.py b/seahub/file_participants/migrations/__init__.py similarity index 100% rename from seahub/social_core/__init__.py rename to seahub/file_participants/migrations/__init__.py diff --git a/seahub/file_tags/apps.py b/seahub/file_tags/apps.py index ff6256cb58..6b3c0a68ed 100644 --- a/seahub/file_tags/apps.py +++ b/seahub/file_tags/apps.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.apps import AppConfig diff --git a/seahub/file_tags/migrations/0001_initial.py b/seahub/file_tags/migrations/0001_initial.py index 864ee50c03..5ebfa5cc96 100644 --- a/seahub/file_tags/migrations/0001_initial.py +++ b/seahub/file_tags/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-11-09 07:00 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/seahub/file_tags/migrations/0002_remove_filetags_parent_folder_uuid.py b/seahub/file_tags/migrations/0002_remove_filetags_parent_folder_uuid.py index 11891b901e..ff7d998c63 100644 --- a/seahub/file_tags/migrations/0002_remove_filetags_parent_folder_uuid.py +++ b/seahub/file_tags/migrations/0002_remove_filetags_parent_folder_uuid.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2019-03-01 02:16 -from __future__ import unicode_literals + from django.db import migrations diff --git a/seahub/file_tags/models.py b/seahub/file_tags/models.py index 98cda4b4e5..dc916c5208 100644 --- a/seahub/file_tags/models.py +++ b/seahub/file_tags/models.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + import os import hashlib from django.db import models diff --git a/seahub/forms.py b/seahub/forms.py index e2ebcb4bd2..fcad2f9922 100644 --- a/seahub/forms.py +++ b/seahub/forms.py @@ -41,7 +41,7 @@ class AddUserForm(forms.Form): should not include '/' """ if "/" in self.cleaned_data["name"]: - raise forms.ValidationError(_(u"Name should not include '/'.")) + raise forms.ValidationError(_("Name should not include '/'.")) return self.cleaned_data["name"] @@ -65,12 +65,12 @@ class RepoCreateForm(forms.Form): """ repo_name = forms.CharField(max_length=settings.MAX_FILE_NAME, error_messages={ - 'required': _(u'Name can\'t be empty'), - 'max_length': _(u'Name is too long (maximum is 255 characters)') + 'required': _('Name can\'t be empty'), + 'max_length': _('Name is too long (maximum is 255 characters)') }) repo_desc = forms.CharField(max_length=100, error_messages={ - 'required': _(u'Description can\'t be empty'), - 'max_length': _(u'Description is too long (maximum is 100 characters)') + 'required': _('Description can\'t be empty'), + 'max_length': _('Description is too long (maximum is 100 characters)') }) encryption = forms.CharField(max_length=1) uuid = forms.CharField(required=False) @@ -80,7 +80,7 @@ class RepoCreateForm(forms.Form): def clean_repo_name(self): repo_name = self.cleaned_data['repo_name'] if not is_valid_dirent_name(repo_name): - error_msg = _(u"Name %s is not valid") % repo_name + error_msg = _("Name %s is not valid") % repo_name raise forms.ValidationError(error_msg) else: return repo_name @@ -119,11 +119,11 @@ class RepoRenameDirentForm(forms.Form): newname = self.cleaned_data['newname'] try: if not is_valid_dirent_name(newname): - error_msg = _(u'Name "%s" is not valid') % newname + error_msg = _('Name "%s" is not valid') % newname raise forms.ValidationError(error_msg) else: return newname - except SearpcError, e: + except SearpcError as e: raise forms.ValidationError(str(e)) class RepoNewDirentForm(forms.Form): @@ -140,11 +140,11 @@ class RepoNewDirentForm(forms.Form): dirent_name = self.cleaned_data['dirent_name'] try: if not is_valid_dirent_name(dirent_name): - error_msg = _(u'Name "%s" is not valid') % dirent_name + error_msg = _('Name "%s" is not valid') % dirent_name raise forms.ValidationError(error_msg) else: return dirent_name - except SearpcError, e: + except SearpcError as e: raise forms.ValidationError(str(e)) class SetUserQuotaForm(forms.Form): @@ -166,7 +166,7 @@ class RepoSettingForm(forms.Form): def clean_repo_name(self): repo_name = self.cleaned_data['repo_name'] if not is_valid_dirent_name(repo_name): - error_msg = _(u"Name %s is not valid") % repo_name + error_msg = _("Name %s is not valid") % repo_name raise forms.ValidationError(error_msg) else: return repo_name diff --git a/seahub/fts/tests.py b/seahub/fts/tests.py index d3db96a24a..9b7b4569d2 100644 --- a/seahub/fts/tests.py +++ b/seahub/fts/tests.py @@ -51,12 +51,12 @@ class BaseTest(LiveServerTestCase): # He is returned to myhome page body = self.browser.find_element_by_tag_name('body') - self.assertIn(u'Libraries', body.text) + self.assertIn('Libraries', body.text) def _logout_user(self, username=None, remove_user=True): if not username: username = self.username - self.browser.find_elements_by_link_text(u'Log out')[0].click() + self.browser.find_elements_by_link_text('Log out')[0].click() if remove_user: self._teardown_new_user(username) @@ -67,7 +67,7 @@ class BaseTest(LiveServerTestCase): # He sees the login heading body = self.browser.find_element_by_tag_name('body') - self.assertIn(u'Log In', body.text) + self.assertIn('Log In', body.text) # He types username and password username_field = self.browser.find_element_by_name('username') @@ -78,12 +78,12 @@ class BaseTest(LiveServerTestCase): # He is returned to myhome page body = self.browser.find_element_by_tag_name('body') - self.assertIn(u'Libraries', body.text) + self.assertIn('Libraries', body.text) # He logout - self.browser.find_elements_by_link_text(u'Log out')[0].click() + self.browser.find_elements_by_link_text('Log out')[0].click() body = self.browser.find_element_by_tag_name('body') - self.assertIn(u'Log In', body.text) + self.assertIn('Log In', body.text) self._teardown_new_user(self.username) @@ -92,10 +92,10 @@ class BaseTest(LiveServerTestCase): self.browser.find_element_by_css_selector('.home-profile .avatar').click() body = self.browser.find_element_by_tag_name('body') - self.assertIn(u'Profile Setting', body.text) + self.assertIn('Profile Setting', body.text) nickname_field = self.browser.find_element_by_name('nickname') - nickname_field.send_keys(u'test_nickname2012') + nickname_field.send_keys('test_nickname2012') intro_field = self.browser.find_element_by_name('intro') intro_field.send_keys('Hi, My name is test.') @@ -103,7 +103,7 @@ class BaseTest(LiveServerTestCase): self.browser.find_element_by_css_selector('.submit').click() body = self.browser.find_element_by_tag_name('body') - self.assertIn(u'Successfully', body.text) + self.assertIn('Successfully', body.text) self._logout_user() @@ -115,8 +115,8 @@ class BaseTest(LiveServerTestCase): # He sees some input fields for "Name" and "description", etc body = self.browser.find_element_by_tag_name('body') - self.assertIn(u'Name', body.text) - self.assertIn(u'Description', body.text) + self.assertIn('Name', body.text) + self.assertIn('Description', body.text) # He types in an test repo reponame_field = self.browser.find_element_by_name('repo_name') @@ -124,7 +124,7 @@ class BaseTest(LiveServerTestCase): repodesc_field = self.browser.find_element_by_name('repo_desc') repodesc_field.send_keys(desc) if encrypt: - self.assertNotEquals(passwd, None) + self.assertNotEqual(passwd, None) self.browser.find_element_by_name('encryption').click() self.browser.find_element_by_name('passwd').send_keys(passwd) self.browser.find_element_by_name('passwd_again').send_keys(passwd) @@ -138,7 +138,7 @@ class BaseTest(LiveServerTestCase): # He is returned to the myhome page, where he can see his new repo, # listed as a clickable link new_repo_links = self.browser.find_elements_by_link_text(name) - self.assertNotEquals(len(new_repo_links), 0) + self.assertNotEqual(len(new_repo_links), 0) def test_can_create_new_library(self): self._login_user() @@ -218,9 +218,9 @@ class BaseTest(LiveServerTestCase): # He creates two folders self._create_new_folder('dir1') - self.assertNotEquals(self.browser.find_elements_by_link_text('dir1'), None) + self.assertNotEqual(self.browser.find_elements_by_link_text('dir1'), None) self._create_new_folder('dir2') - self.assertNotEquals(self.browser.find_elements_by_link_text('dir2'), None) + self.assertNotEqual(self.browser.find_elements_by_link_text('dir2'), None) '''Moving folder from one to another''' # He clicks more op icon diff --git a/seahub/group/forms.py b/seahub/group/forms.py index 445894aee7..85c7b4f2ab 100644 --- a/seahub/group/forms.py +++ b/seahub/group/forms.py @@ -26,14 +26,14 @@ class GroupAddForm(forms.Form): A form used to add a new group. """ group_name = forms.CharField(max_length=255, error_messages={ - 'required': _(u'Group name can\'t be empty'), - 'max_length': _(u'Group name is too long (maximum is 255 characters)'), + 'required': _('Group name can\'t be empty'), + 'max_length': _('Group name is too long (maximum is 255 characters)'), }) def clean_group_name(self): group_name = self.cleaned_data['group_name'] group_name = group_name.strip() if not validate_group_name(group_name): - error_msg = _(u'Group name can only contain letters, numbers, blank, hyphen or underscore') + error_msg = _('Group name can only contain letters, numbers, blank, hyphen or underscore') raise forms.ValidationError(error_msg) else: return group_name @@ -43,8 +43,8 @@ class GroupJoinMsgForm(forms.Form): A form used to send group join request message. """ group_join_msg = forms.CharField(max_length=255, error_messages={ - 'required': _(u'Verification message can\'t be empty'), - 'max_length': _(u'Verification message is too long (maximun is 255 characters)'), + 'required': _('Verification message can\'t be empty'), + 'max_length': _('Verification message is too long (maximun is 255 characters)'), }) class WikiCreateForm(forms.Form): @@ -53,18 +53,18 @@ class WikiCreateForm(forms.Form): """ repo_name = forms.CharField(max_length=settings.MAX_FILE_NAME, error_messages={ - 'required': _(u'Name can\'t be empty'), - 'max_length': _(u'Name is too long (maximum is 255 characters)') + 'required': _('Name can\'t be empty'), + 'max_length': _('Name is too long (maximum is 255 characters)') }) repo_desc = forms.CharField(max_length=100, error_messages={ - 'required': _(u'Description can\'t be empty'), - 'max_length': _(u'Description is too long (maximum is 100 characters)') + 'required': _('Description can\'t be empty'), + 'max_length': _('Description is too long (maximum is 100 characters)') }) def clean_repo_name(self): repo_name = self.cleaned_data['repo_name'] if not is_valid_dirent_name(repo_name): - error_msg = _(u'"%s" is not a valid name') % repo_name + error_msg = _('"%s" is not a valid name') % repo_name raise forms.ValidationError(error_msg) else: return repo_name diff --git a/seahub/group/migrations/0001_initial.py b/seahub/group/migrations/0001_initial.py index 344635b694..313e4dec4c 100644 --- a/seahub/group/migrations/0001_initial.py +++ b/seahub/group/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:43 -from __future__ import unicode_literals + import datetime from django.db import migrations, models diff --git a/seahub/group/tests/tests.py b/seahub/group/tests/tests.py index 502876e591..d532b27753 100644 --- a/seahub/group/tests/tests.py +++ b/seahub/group/tests/tests.py @@ -49,7 +49,7 @@ class GroupMessageTest(GroupTestCase): response = self.client.post('/group/1/', { 'message': '', }) - self.failUnlessEqual(GroupMessage.objects.all().count(), 0) + self.assertEqual(GroupMessage.objects.all().count(), 0) def test_leave_500_chars_msg(self): f = open(os.path.join(self.testdatapath, "valid_message"), "rb") @@ -67,7 +67,7 @@ class GroupMessageTest(GroupTestCase): response = self.client.post('/group/1/', { 'message': message, }) - self.failUnlessEqual(GroupMessage.objects.all().count(), 0) + self.assertEqual(GroupMessage.objects.all().count(), 0) class ReplyMessageTest(GroupTestCase): fixtures = ['groupmessage.json'] @@ -118,9 +118,9 @@ class GroupRecommendTest(GroupTestCase): 'attach_type': 'file', }, follow=True) - self.assertEquals(len(response.context['messages']), 1) + self.assertEqual(len(response.context['messages']), 1) for message in response.context['messages']: - self.assert_('请检查群组名称' in str(message)) + self.assertTrue('请检查群组名称' in str(message)) def test_recommend_file_to_unparticipated_group(self): @@ -132,6 +132,6 @@ class GroupRecommendTest(GroupTestCase): 'attach_type': 'file', }, follow=True) - self.assertEquals(len(response.context['messages']), 1) + self.assertEqual(len(response.context['messages']), 1) for message in response.context['messages']: - self.assert_('请检查是否参加了该群组' in str(message)) + self.assertTrue('请检查是否参加了该群组' in str(message)) diff --git a/seahub/group/urls.py b/seahub/group/urls.py index c54b15776a..7b9109bffc 100644 --- a/seahub/group/urls.py +++ b/seahub/group/urls.py @@ -1,7 +1,7 @@ # Copyright (c) 2012-2016 Seafile Ltd. from django.conf.urls import url -from views import group_wiki, group_wiki_create, \ +from .views import group_wiki, group_wiki_create, \ group_wiki_page_new, group_wiki_page_edit, group_wiki_pages, \ group_wiki_page_delete, group_wiki_use_lib, group_remove diff --git a/seahub/group/views.py b/seahub/group/views.py index e479c16be2..27153d3fde 100644 --- a/seahub/group/views.py +++ b/seahub/group/views.py @@ -3,7 +3,7 @@ import logging import os import json -import urllib2 +import urllib.request, urllib.error, urllib.parse from django.conf import settings from django.core.urlresolvers import reverse @@ -23,8 +23,8 @@ from seaserv import ccnet_threaded_rpc, seafile_api, \ remove_repo, get_file_id_by_path, post_empty_file, del_file from pysearpc import SearpcError -from models import PublicGroup -from forms import MessageForm, WikiCreateForm +from .models import PublicGroup +from .forms import MessageForm, WikiCreateForm from seahub.auth import REDIRECT_FIELD_NAME from seahub.base.decorators import sys_staff_required, require_POST from seahub.group.utils import validate_group_name, BadGroupNameError, \ @@ -75,7 +75,7 @@ def remove_group_common(group_id, username, org_id=None): """ seaserv.ccnet_threaded_rpc.remove_group(group_id, username) seaserv.seafserv_threaded_rpc.remove_repo_group(group_id) - if org_id is not None and org_id > 0: + if org_id and org_id > 0: seaserv.ccnet_threaded_rpc.remove_org_group(org_id, group_id) # remove record of share to group when group deleted ExtraGroupsSharePermission.objects.filter(group_id=group_id).delete() @@ -139,16 +139,16 @@ def group_remove(request, group_id): operation. """ # Request header may missing HTTP_REFERER, we need to handle that case. - next = request.META.get('HTTP_REFERER', SITE_ROOT) + next_page = request.META.get('HTTP_REFERER', SITE_ROOT) try: group_id_int = int(group_id) except ValueError: - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) remove_group_common(group_id_int, request.user.username) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) def rename_group_with_new_name(request, group_id, new_group_name): """Rename a group with new name. @@ -190,7 +190,7 @@ def send_group_member_add_mail(request, group, from_user, to_user): 'group': group, } - subject = _(u'You are invited to join a group on %s') % get_site_name() + subject = _('You are invited to join a group on %s') % get_site_name() send_html_email(subject, 'group/add_member_email.html', c, None, [to_user]) ########## wiki @@ -210,7 +210,7 @@ def group_wiki(request, group, page_name="home"): group_repos = get_group_repos(group.id, username) group_repos = [r for r in group_repos if not r.encrypted] return render(request, "group/group_wiki.html", { - "group" : group, + "group": group, "is_staff": group.is_staff, "wiki_exists": wiki_exists, "mods_enabled": mods_enabled, @@ -257,7 +257,7 @@ def group_wiki(request, group, page_name="home"): wiki_index_exists = False return render(request, "group/group_wiki.html", { - "group" : group, + "group": group, "is_staff": group.is_staff, "wiki_exists": wiki_exists, "content": content, @@ -328,7 +328,7 @@ def group_wiki_create(request, group): form = WikiCreateForm(request.POST) if not form.is_valid(): - return json_error(str(form.errors.values()[0])) + return json_error(str(list(form.errors.values())[0])) # create group repo in user context repo_name = form.cleaned_data['repo_name'] @@ -338,23 +338,23 @@ def group_wiki_create(request, group): repo_id = seafile_api.create_repo(repo_name, repo_desc, user) if not repo_id: - return json_error(_(u'Failed to create'), 500) + return json_error(_('Failed to create'), 500) try: seafile_api.set_group_repo(repo_id, group.id, user, permission) except SearpcError as e: remove_repo(repo_id) - return json_error(_(u'Failed to create: internal error.'), 500) + return json_error(_('Failed to create: internal error.'), 500) GroupWiki.objects.save_group_wiki(group_id=group.id, repo_id=repo_id) # create home page page_name = "home.md" if not post_empty_file(repo_id, "/", page_name, user): - return json_error(_(u'Failed to create home page. Please retry later'), 500) + return json_error(_('Failed to create home page. Please retry later'), 500) - next = reverse('group_wiki', args=[group.id]) - return HttpResponse(json.dumps({'href': next}), content_type=content_type) + next_page = reverse('group_wiki', args=[group.id]) + return HttpResponse(json.dumps({'href': next_page}), content_type=content_type) @group_check def group_wiki_use_lib(request, group): @@ -364,15 +364,15 @@ def group_wiki_use_lib(request, group): raise Http404 repo_id = request.POST.get('dst_repo', '') username = request.user.username - next = reverse('group_wiki', args=[group.id]) + next_page = reverse('group_wiki', args=[group.id]) repo = seafile_api.get_repo(repo_id) if repo is None: messages.error(request, _('Failed to set wiki library.')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) if check_folder_permission(request, repo_id, '/') != 'rw': messages.error(request, _('Permission denied.')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) GroupWiki.objects.save_group_wiki(group_id=group.id, repo_id=repo_id) @@ -382,7 +382,7 @@ def group_wiki_use_lib(request, group): if not seaserv.post_empty_file(repo_id, "/", page_name, username): messages.error(request, _('Failed to create home page. Please retry later')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) @group_check def group_wiki_page_new(request, group, page_name="home"): @@ -414,7 +414,7 @@ def group_wiki_page_new(request, group, page_name="home"): url = "%s?p=%s&from=wiki_page_new&gid=%s" % ( reverse('file_edit', args=[repo.id]), - urllib2.quote(filepath.encode('utf-8')), group.id) + urllib.parse.quote(filepath.encode('utf-8')), group.id) return HttpResponseRedirect(url) @@ -431,7 +431,7 @@ def group_wiki_page_edit(request, group, page_name="home"): filepath = "/" + page_name + ".md" url = "%s?p=%s&from=wiki_page_edit&gid=%s" % ( reverse('file_edit', args=[repo.id]), - urllib2.quote(filepath.encode('utf-8')), group.id) + urllib.parse.quote(filepath.encode('utf-8')), group.id) return HttpResponseRedirect(url) diff --git a/seahub/handlers.py b/seahub/handlers.py index 6cca286d96..67ed19c8af 100644 --- a/seahub/handlers.py +++ b/seahub/handlers.py @@ -1,7 +1,7 @@ # Copyright (c) 2012-2016 Seafile Ltd. import logging -import settings +from . import settings import datetime from seaserv import seafile_api, get_org_id_by_repo_id @@ -20,7 +20,7 @@ try: # Move here to avoid model import during Django setup. # TODO: Don't register signal/handlers during Seahub start. - if org_id > 0: + if org_id and org_id > 0: related_users = seafile_api.org_get_shared_users_by_repo(org_id, repo_id) else: related_users = seafile_api.get_shared_users_by_repo(repo_id) @@ -30,8 +30,8 @@ try: related_users.append(creator) record = { - 'op_type':'create', - 'obj_type':'repo', + 'op_type': 'create', + 'obj_type': 'repo', 'timestamp': datetime.datetime.utcnow(), 'repo_id': repo_id, 'repo_name': repo_name, @@ -41,7 +41,7 @@ try: 'org_id': org_id, } - from utils import SeafEventsSession + from .utils import SeafEventsSession session = SeafEventsSession() seafevents.save_user_activity(session, record) session.close() @@ -50,7 +50,7 @@ try: library_template = kwargs['library_template'] if LIBRARY_TEMPLATES and library_template: - if isinstance(library_template, unicode): + if isinstance(library_template, str): library_template = library_template.encode('utf-8') try: @@ -73,7 +73,7 @@ try: repo_id = kwargs['repo_id'] repo_name = kwargs['repo_name'] - if org_id > 0: + if org_id and org_id > 0: related_users = seafile_api.org_get_shared_users_by_repo(org_id, repo_id) else: related_users = seafile_api.get_shared_users_by_repo(repo_id) @@ -83,18 +83,18 @@ try: related_users.append(repo_owner) record = { - 'op_type':'delete', - 'obj_type':'repo', + 'op_type': 'delete', + 'obj_type': 'repo', 'timestamp': datetime.datetime.utcnow(), 'repo_id': repo_id, 'repo_name': repo_name, 'path': '/', 'op_user': operator, 'related_users': related_users, - 'org_id': org_id if org_id > 0 else -1, + 'org_id': org_id if org_id and org_id > 0 else -1, } - from utils import SeafEventsSession + from .utils import SeafEventsSession session = SeafEventsSession() seafevents.save_user_activity(session, record) session.close() @@ -109,7 +109,7 @@ try: repo_name = kwargs['repo_name'] repo_owner = kwargs['repo_owner'] - if org_id > 0: + if org_id and org_id > 0: related_users = seafile_api.org_get_shared_users_by_repo(org_id, repo_id) else: related_users = seafile_api.get_shared_users_by_repo(repo_id) @@ -119,8 +119,8 @@ try: related_users.append(repo_owner) record = { - 'op_type':'clean-up-trash', - 'obj_type':'repo', + 'op_type': 'clean-up-trash', + 'obj_type': 'repo', 'timestamp': datetime.datetime.utcnow(), 'repo_id': repo_id, 'repo_name': repo_name, @@ -131,7 +131,7 @@ try: 'org_id': org_id, } - from utils import SeafEventsSession + from .utils import SeafEventsSession session = SeafEventsSession() seafevents.save_user_activity(session, record) session.close() @@ -141,7 +141,7 @@ try: operator = kwargs['operator'] repo = seafile_api.get_repo(repo_id) org_id = get_org_id_by_repo_id(repo_id) - if org_id > 0: + if org_id and org_id > 0: related_users = seafile_api.org_get_shared_users_by_repo(org_id, repo_id) repo_owner = seafile_api.get_org_repo_owner(repo_id) else: @@ -152,8 +152,8 @@ try: related_users.append(repo_owner) record = { - 'op_type':'recover', - 'obj_type':'repo', + 'op_type': 'recover', + 'obj_type': 'repo', 'timestamp': datetime.datetime.utcnow(), 'repo_id': repo_id, 'repo_name': repo.repo_name, @@ -163,7 +163,7 @@ try: 'org_id': org_id, } - from utils import SeafEventsSession + from .utils import SeafEventsSession session = SeafEventsSession() seafevents.save_user_activity(session, record) session.close() diff --git a/seahub/institutions/migrations/0001_initial.py b/seahub/institutions/migrations/0001_initial.py index f4e846a877..65090d9757 100644 --- a/seahub/institutions/migrations/0001_initial.py +++ b/seahub/institutions/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models import django.utils.timezone diff --git a/seahub/institutions/migrations/0002_institutionquota.py b/seahub/institutions/migrations/0002_institutionquota.py index f862ded98f..832f3317ce 100644 --- a/seahub/institutions/migrations/0002_institutionquota.py +++ b/seahub/institutions/migrations/0002_institutionquota.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/institutions/migrations/0003_auto_20180426_0710.py b/seahub/institutions/migrations/0003_auto_20180426_0710.py index da74814ba3..89a5d078d5 100644 --- a/seahub/institutions/migrations/0003_auto_20180426_0710.py +++ b/seahub/institutions/migrations/0003_auto_20180426_0710.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-04-26 07:10 -from __future__ import unicode_literals + from django.db import migrations import seahub.base.fields diff --git a/seahub/institutions/views.py b/seahub/institutions/views.py index d3179ad3d5..01e53b5e13 100644 --- a/seahub/institutions/views.py +++ b/seahub/institutions/views.py @@ -133,7 +133,7 @@ def user_info(request, email): owned_repos = mute_seafile_api.get_owned_repo_list(email, ret_corrupted=True) - owned_repos = filter(lambda r: not r.is_virtual, owned_repos) + owned_repos = [r for r in owned_repos if not r.is_virtual] in_repos = mute_seafile_api.get_share_in_repo_list(email, -1, -1) space_usage = mute_seafile_api.get_user_self_usage(email) @@ -185,16 +185,16 @@ def user_remove(request, email): """Remove a institution user. """ referer = request.META.get('HTTP_REFERER', None) - next = reverse('institutions:useradmin') if referer is None else referer + next_page = reverse('institutions:useradmin') if referer is None else referer try: user = User.objects.get(email=email) user.delete() - messages.success(request, _(u'Successfully deleted %s') % user.username) + messages.success(request, _('Successfully deleted %s') % user.username) except User.DoesNotExist: - messages.error(request, _(u'Failed to delete: the user does not exist')) + messages.error(request, _('Failed to delete: the user does not exist')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) @login_required_ajax @require_POST @@ -208,7 +208,7 @@ def user_set_quota(request, email): available_quota = get_institution_available_quota(request.user.institution) if available_quota < quota: result = {} - result['error'] = _(u'Failed to set quota: maximum quota is %d MB' % \ + result['error'] = _('Failed to set quota: maximum quota is %d MB' % \ (available_quota / 10 ** 6)) return HttpResponse(json.dumps(result), status=400, content_type=content_type) diff --git a/seahub/invitations/migrations/0001_initial.py b/seahub/invitations/migrations/0001_initial.py index cefc33955c..1f08a72bf1 100644 --- a/seahub/invitations/migrations/0001_initial.py +++ b/seahub/invitations/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models import seahub.base.fields diff --git a/seahub/invitations/migrations/0002_invitation_invite_type.py b/seahub/invitations/migrations/0002_invitation_invite_type.py index 448fce1ab6..d4fb8caf7e 100644 --- a/seahub/invitations/migrations/0002_invitation_invite_type.py +++ b/seahub/invitations/migrations/0002_invitation_invite_type.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/invitations/migrations/0003_auto_20160510_1703.py b/seahub/invitations/migrations/0003_auto_20160510_1703.py index 2d0c4405bd..80c323b99d 100644 --- a/seahub/invitations/migrations/0003_auto_20160510_1703.py +++ b/seahub/invitations/migrations/0003_auto_20160510_1703.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/invitations/migrations/0004_auto_20160629_1610.py b/seahub/invitations/migrations/0004_auto_20160629_1610.py index 46983ed2bf..cb68123b81 100644 --- a/seahub/invitations/migrations/0004_auto_20160629_1610.py +++ b/seahub/invitations/migrations/0004_auto_20160629_1610.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models import datetime diff --git a/seahub/invitations/migrations/0005_auto_20160629_1614.py b/seahub/invitations/migrations/0005_auto_20160629_1614.py index da90155f17..6252be418e 100644 --- a/seahub/invitations/migrations/0005_auto_20160629_1614.py +++ b/seahub/invitations/migrations/0005_auto_20160629_1614.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/notifications/management/commands/send_file_updates.py b/seahub/notifications/management/commands/send_file_updates.py index 4bec516eac..65ba0614fa 100644 --- a/seahub/notifications/management/commands/send_file_updates.py +++ b/seahub/notifications/management/commands/send_file_updates.py @@ -229,7 +229,7 @@ class Command(BaseCommand): continue # remove my activities - res = filter(lambda x: x.op_user != username, res) + res = [x for x in res if x.op_user != username] if not res: continue diff --git a/seahub/notifications/management/commands/send_notices.py b/seahub/notifications/management/commands/send_notices.py index 577ad82713..83c8e69c10 100644 --- a/seahub/notifications/management/commands/send_notices.py +++ b/seahub/notifications/management/commands/send_notices.py @@ -248,7 +248,7 @@ class Command(BaseCommand): else: email_ctx[notice.to_user] = 1 - for to_user, count in email_ctx.items(): + for to_user, count in list(email_ctx.items()): # save current language cur_language = translation.get_language() diff --git a/seahub/notifications/management/commands/send_work_weixin_notifications.py b/seahub/notifications/management/commands/send_work_weixin_notifications.py index 6b1bb091ba..aca6bebb38 100644 --- a/seahub/notifications/management/commands/send_work_weixin_notifications.py +++ b/seahub/notifications/management/commands/send_work_weixin_notifications.py @@ -24,7 +24,6 @@ logger = logging.getLogger(__name__) # https://work.weixin.qq.com/api/doc#90000/90135/90236/ -# from social_django.models import UserSocialAuth ########## Utility Functions ########## def wrap_div(s): @@ -141,7 +140,7 @@ class Command(BaseCommand, CommandLogMixin): qs = UserNotification.objects.filter( timestamp__gt=last_check_dt ).filter(seen=False).filter( - to_user__in=user_uid_map.keys() + to_user__in=list(user_uid_map.keys()) ) self.log_info('Found %d notices' % qs.count()) if qs.count() == 0: diff --git a/seahub/notifications/management/commands/send_wxwork_notices.py b/seahub/notifications/management/commands/send_wxwork_notices.py deleted file mode 100644 index 537f8660fc..0000000000 --- a/seahub/notifications/management/commands/send_wxwork_notices.py +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright (c) 2012-2016 Seafile Ltd. -# encoding: utf-8 -from datetime import datetime -import logging -import re - -from django.conf import settings -from django.core.management.base import BaseCommand -from django.core.urlresolvers import reverse -from django.utils import translation -from django.utils.translation import ungettext -from social_django.models import UserSocialAuth -from weworkapi import CorpApi - -from seahub.base.models import CommandsLastCheck -from seahub.notifications.models import UserNotification -from seahub.profile.models import Profile -from seahub.utils import get_site_scheme_and_netloc, get_site_name - -# Get an instance of a logger -logger = logging.getLogger(__name__) - -########## Utility Functions ########## -def wrap_div(s): - """ - Replace xx to xx and wrap content with
. - """ - patt = '(.+?)' - - def repl(matchobj): - return matchobj.group(1) - - return '
' + re.sub(patt, repl, s) + '
' - -class CommandLogMixin(object): - def println(self, msg): - self.stdout.write('[%s] %s\n' % (str(datetime.now()), msg)) - - def log_error(self, msg): - logger.error(msg) - self.println(msg) - - def log_info(self, msg): - logger.info(msg) - self.println(msg) - - def log_debug(self, msg): - logger.debug(msg) - self.println(msg) - -####################################### - -class Command(BaseCommand, CommandLogMixin): - """ please use send_work_weixin_notifications.py - """ - - help = 'Send WeChat Work msg to user if he/she has unseen notices every ' - 'period of time.' - label = "notifications_send_wxwork_notices" - - def handle(self, *args, **options): - self.log_debug('Start sending WeChat Work msg...') - self.api = CorpApi.CorpApi(settings.SOCIAL_AUTH_WEIXIN_WORK_KEY, - settings.SOCIAL_AUTH_WEIXIN_WORK_SECRET) - - self.do_action() - self.log_debug('Finish sending WeChat Work msg.\n') - - def send_wx_msg(self, uid, title, content, detail_url): - try: - self.log_info('Send wechat msg to user: %s, msg: %s' % (uid, content)) - response = self.api.httpCall( - CorpApi.CORP_API_TYPE['MESSAGE_SEND'], - { - "touser": uid, - "agentid": settings.SOCIAL_AUTH_WEIXIN_WORK_AGENTID, - 'msgtype': 'textcard', - # 'climsgid': 'climsgidclimsgid_d', - 'textcard': { - 'title': title, - 'description': content, - 'url': detail_url, - }, - 'safe': 0, - }) - self.log_info(response) - except Exception as ex: - logger.error(ex, exc_info=True) - - def get_user_language(self, username): - return Profile.objects.get_user_language(username) - - def do_action(self): - now = datetime.now() - today = datetime.now().replace(hour=0).replace(minute=0).replace( - second=0).replace(microsecond=0) - - # 1. get all users who are connected wechat work - socials = UserSocialAuth.objects.filter(provider='weixin-work') - users = [(x.username, x.uid) for x in socials] - if not users: - return - - user_uid_map = {} - for username, uid in users: - user_uid_map[username] = uid - - # 2. get previous time that command last runs - try: - cmd_last_check = CommandsLastCheck.objects.get(command_type=self.label) - self.log_debug('Last check time is %s' % cmd_last_check.last_check) - - last_check_dt = cmd_last_check.last_check - - cmd_last_check.last_check = now - cmd_last_check.save() - except CommandsLastCheck.DoesNotExist: - last_check_dt = today - self.log_debug('Create new last check time: %s' % now) - CommandsLastCheck(command_type=self.label, last_check=now).save() - - # 3. get all unseen notices for those users - qs = UserNotification.objects.filter( - timestamp__gt=last_check_dt - ).filter(seen=False).filter( - to_user__in=user_uid_map.keys() - ) - - user_notices = {} - for q in qs: - if q.to_user not in user_notices: - user_notices[q.to_user] = [q] - else: - user_notices[q.to_user].append(q) - - # 4. send msg to users - url = get_site_scheme_and_netloc().rstrip('/') + reverse('user_notification_list') - - for username, uid in users: - notices = user_notices.get(username, []) - count = len(notices) - if count == 0: - continue - - # save current language - cur_language = translation.get_language() - - # get and active user language - user_language = self.get_user_language(username) - translation.activate(user_language) - self.log_debug('Set language code to %s for user: %s' % ( - user_language, username)) - - title = ungettext( - "\n" - "You've got 1 new notice on %(site_name)s:\n", - "\n" - "You've got %(num)s new notices on %(site_name)s:\n", - count - ) % { - 'num': count, - 'site_name': get_site_name(), - } - content = ''.join([wrap_div(x.format_msg()) for x in notices]) - self.send_wx_msg(uid, title, content, url) - - translation.activate(cur_language) diff --git a/seahub/notifications/migrations/0001_initial.py b/seahub/notifications/migrations/0001_initial.py index b38f7d0ff4..86bca94be6 100644 --- a/seahub/notifications/migrations/0001_initial.py +++ b/seahub/notifications/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:43 -from __future__ import unicode_literals + import datetime from django.db import migrations, models diff --git a/seahub/notifications/migrations/0002_auto_20180426_0710.py b/seahub/notifications/migrations/0002_auto_20180426_0710.py index 358237c973..d8423578ee 100644 --- a/seahub/notifications/migrations/0002_auto_20180426_0710.py +++ b/seahub/notifications/migrations/0002_auto_20180426_0710.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-04-26 07:10 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/notifications/migrations/0003_auto_20181115_0825.py b/seahub/notifications/migrations/0003_auto_20181115_0825.py index 8f7b676070..4adcb70450 100644 --- a/seahub/notifications/migrations/0003_auto_20181115_0825.py +++ b/seahub/notifications/migrations/0003_auto_20181115_0825.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-11-15 08:25 -from __future__ import unicode_literals + import datetime from django.db import migrations, models diff --git a/seahub/notifications/models.py b/seahub/notifications/models.py index 5ea6707f9a..d2789f2241 100644 --- a/seahub/notifications/models.py +++ b/seahub/notifications/models.py @@ -451,7 +451,7 @@ class UserNotification(models.Model): try: detail = json.loads(self.detail) except ValueError: - raise self.InvalidDetailError, 'Wrong detail format of group message' + raise self.InvalidDetailError('Wrong detail format of group message') else: if isinstance(detail, int): # Compatible with existing records group_id = detail @@ -466,7 +466,7 @@ class UserNotification(models.Model): else: return {'group_id': group_id, 'msg_from': msg_from} else: - raise self.InvalidDetailError, 'Wrong detail format of group message' + raise self.InvalidDetailError('Wrong detail format of group message') def user_message_detail_to_dict(self): """Parse user message detail, returns dict contains ``message`` and @@ -526,7 +526,7 @@ class UserNotification(models.Model): d = json.loads(self.detail) except Exception as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") filename = d['file_name'] repo_id = d['repo_id'] @@ -544,14 +544,14 @@ class UserNotification(models.Model): name = os.path.basename(uploaded_to) file_link = reverse('view_lib_file', args=[repo_id, file_path]) - msg = _(u"A file named %(file_name)s is uploaded to %(name)s") % { + msg = _("A file named %(file_name)s is uploaded to %(name)s") % { 'file_link': file_link, 'file_name': escape(filename), 'link': link, 'name': escape(name), } else: - msg = _(u"A file named %(file_name)s is uploaded to Deleted Library") % { + msg = _("A file named %(file_name)s is uploaded to Deleted Library") % { 'file_name': escape(filename), } @@ -567,7 +567,7 @@ class UserNotification(models.Model): d = json.loads(self.detail) except Exception as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") share_from = email2nickname(d['share_from']) repo_id = d['repo_id'] @@ -618,7 +618,7 @@ class UserNotification(models.Model): d = json.loads(self.detail) except Exception as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") share_from = email2nickname(d['share_from']) repo_id = d['repo_id'] @@ -674,7 +674,7 @@ class UserNotification(models.Model): d = self.group_message_detail_to_dict() except self.InvalidDetailError as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") group_id = d.get('group_id') group = ccnet_api.get_group(group_id) @@ -685,11 +685,11 @@ class UserNotification(models.Model): msg_from = d.get('msg_from') if msg_from is None: - msg = _(u"%(group_name)s has a new discussion.") % { + msg = _("%(group_name)s has a new discussion.") % { 'href': HASH_URLS['GROUP_DISCUSS'] % {'group_id': group.id}, 'group_name': group.group_name} else: - msg = _(u"%(user)s posted a new discussion in %(group_name)s.") % { + msg = _("%(user)s posted a new discussion in %(group_name)s.") % { 'href': HASH_URLS['GROUP_DISCUSS'] % {'group_id': group.id}, 'user': escape(email2nickname(msg_from)), 'group_name': escape(group.group_name) @@ -706,7 +706,7 @@ class UserNotification(models.Model): d = self.group_message_detail_to_dict() except self.InvalidDetailError as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") message = d.get('message') if message is not None: @@ -724,7 +724,7 @@ class UserNotification(models.Model): d = json.loads(self.detail) except Exception as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") username = d['username'] group_id = d['group_id'] @@ -735,7 +735,7 @@ class UserNotification(models.Model): self.delete() return None - msg = _(u"User %(username)s has asked to join group %(group_name)s, verification message: %(join_request_msg)s") % { + msg = _("User %(username)s has asked to join group %(group_name)s, verification message: %(join_request_msg)s") % { 'user_profile': reverse('user_profile', args=[username]), 'username': username, 'href': HASH_URLS['GROUP_MEMBERS'] % {'group_id': group_id}, @@ -754,7 +754,7 @@ class UserNotification(models.Model): d = json.loads(self.detail) except Exception as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") group_staff = d['group_staff'] group_id = d['group_id'] @@ -764,7 +764,7 @@ class UserNotification(models.Model): self.delete() return None - msg = _(u"User %(group_staff)s has added you to group %(group_name)s") % { + msg = _("User %(group_staff)s has added you to group %(group_name)s") % { 'user_profile': reverse('user_profile', args=[group_staff]), 'group_staff': escape(email2nickname(group_staff)), 'href': reverse('group', args=[group_id]), @@ -776,7 +776,7 @@ class UserNotification(models.Model): d = json.loads(self.detail) except Exception as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") repo_id = d['repo_id'] file_path = d['file_path'] @@ -802,7 +802,7 @@ class UserNotification(models.Model): d = json.loads(self.detail) except Exception as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") draft_id = d['draft_id'] author = d['author'] @@ -819,7 +819,7 @@ class UserNotification(models.Model): d = json.loads(self.detail) except Exception as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") draft_id = d['draft_id'] from_user = d['from_user'] @@ -836,7 +836,7 @@ class UserNotification(models.Model): d = json.loads(self.detail) except Exception as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") inv_id = d['invitation_id'] try: @@ -865,7 +865,7 @@ class UserNotification(models.Model): d = json.loads(self.detail) except Exception as e: logger.error(e) - return _(u"Internal error") + return _("Internal error") repo_owner_name = email2nickname(d['repo_owner']) repo_id = d['repo_id'] diff --git a/seahub/notifications/tests.py b/seahub/notifications/tests.py index 6c94fb1b78..07bf48527c 100644 --- a/seahub/notifications/tests.py +++ b/seahub/notifications/tests.py @@ -2,7 +2,7 @@ from django.core.urlresolvers import reverse from django.test import TestCase, Client -from models import Notification +from .models import Notification from base.accounts import User class NotificationTestCase(TestCase): @@ -68,11 +68,11 @@ class NotificationTest(NotificationTestCase): # check it's showed in top bar r = self.client.get('/sys/notificationadmin/') - self.assert_('This is a new notification!' in str(r)) + self.assertTrue('This is a new notification!' in str(r)) # and it's still there when reach other pages r = self.client.get('/home/my/') - self.assert_('This is a new notification!' in str(r)) + self.assertTrue('This is a new notification!' in str(r)) def test_close_notification(self): n = Notification() @@ -82,7 +82,7 @@ class NotificationTest(NotificationTestCase): self.login() r = self.client.get('/home/my/') - self.assert_('This is a new notification!' in str(r)) + self.assertTrue('This is a new notification!' in str(r)) # now close notification r = self.client.get(reverse('notification_close', args=[1]), {}) @@ -90,9 +90,9 @@ class NotificationTest(NotificationTestCase): self.assertEqual(r.status_code, 302) # it's gone - self.assert_('This is a new notification!' not in str(r)) + self.assertTrue('This is a new notification!' not in str(r)) # and it's gone when reach other pages r = self.client.get('/home/my/') - self.assert_('This is a new notification!' not in str(r)) + self.assertTrue('This is a new notification!' not in str(r)) diff --git a/seahub/notifications/views.py b/seahub/notifications/views.py index 341ba4ac6a..ff3b40fbb3 100644 --- a/seahub/notifications/views.py +++ b/seahub/notifications/views.py @@ -127,10 +127,10 @@ def user_notification_remove(request): UserNotification.objects.remove_user_notifications(request.user.username) messages.success(request, _("Successfully cleared all notices.")) - next = request.META.get('HTTP_REFERER', None) - if not next: - next = settings.SITE_ROOT - return HttpResponseRedirect(next) + next_page = request.META.get('HTTP_REFERER', None) + if not next_page: + next_page = settings.SITE_ROOT + return HttpResponseRedirect(next_page) def add_notice_from_info(notices): '''Add 'msg_from' or 'default_avatar_url' to notice. diff --git a/seahub/oauth/views.py b/seahub/oauth/views.py index 3afa21bd12..7892c4212d 100644 --- a/seahub/oauth/views.py +++ b/seahub/oauth/views.py @@ -117,7 +117,7 @@ def oauth_callback(request): client_secret=CLIENT_SECRET, authorization_response=request.get_full_path()) - if session._client.__dict__['token'].has_key('user_id'): + if 'user_id' in session._client.__dict__['token']: # used for sjtu.edu.cn # https://xjq12311.gitbooks.io/sjtu-engtc/content/ user_id = session._client.__dict__['token']['user_id'] @@ -141,7 +141,7 @@ def oauth_callback(request): user_info = {} user_info_json = user_info_resp.json() - for item, attr in ATTRIBUTE_MAP.items(): + for item, attr in list(ATTRIBUTE_MAP.items()): required, user_attr = attr value = user_info_json.get(item, '') @@ -174,7 +174,7 @@ def oauth_callback(request): if not user or not user.is_active: logger.error('User %s not found or inactive.' % email) # a page for authenticate user failed - return render_error(request, _(u'User %s not found.') % email) + return render_error(request, _('User %s not found.') % email) # User is valid. Set request.user and persist user in the session # by logging the user in. @@ -182,9 +182,9 @@ def oauth_callback(request): auth.login(request, user) # update user's profile - name = user_info['name'] if user_info.has_key('name') else '' + name = user_info['name'] if 'name' in user_info else '' contact_email = user_info['contact_email'] if \ - user_info.has_key('contact_email') else '' + 'contact_email' in user_info else '' profile = Profile.objects.get_profile_by_user(email) if not profile: diff --git a/seahub/onlyoffice/utils.py b/seahub/onlyoffice/utils.py index a623b11a0a..262b7342cc 100644 --- a/seahub/onlyoffice/utils.py +++ b/seahub/onlyoffice/utils.py @@ -1,7 +1,7 @@ import os import json import hashlib -import urlparse +import urllib.parse import posixpath from django.core.cache import cache @@ -72,7 +72,7 @@ def get_onlyoffice_dict(username, repo_id, file_path, base_url = get_site_scheme_and_netloc() onlyoffice_editor_callback_url = reverse('onlyoffice_editor_callback') - calllback_url = urlparse.urljoin(base_url, onlyoffice_editor_callback_url) + calllback_url = urllib.parse.urljoin(base_url, onlyoffice_editor_callback_url) return_dict = { 'repo_id': repo_id, diff --git a/seahub/options/migrations/0001_initial.py b/seahub/options/migrations/0001_initial.py index 0c30f7b09d..937e85d8d2 100644 --- a/seahub/options/migrations/0001_initial.py +++ b/seahub/options/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:43 -from __future__ import unicode_literals + from django.db import migrations, models import seahub.base.fields diff --git a/seahub/options/migrations/0002_auto_20181107_0811.py b/seahub/options/migrations/0002_auto_20181107_0811.py index 0c28bf64d2..d72fc0e3dd 100644 --- a/seahub/options/migrations/0002_auto_20181107_0811.py +++ b/seahub/options/migrations/0002_auto_20181107_0811.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-11-07 08:11 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/options/urls.py b/seahub/options/urls.py index 2ea40914cf..ca4a395fbe 100644 --- a/seahub/options/urls.py +++ b/seahub/options/urls.py @@ -1,7 +1,7 @@ # Copyright (c) 2012-2016 Seafile Ltd. from django.conf.urls import url -from views import * +from .views import * urlpatterns = [ url(r'^save/$', save_options, name='options_save'), diff --git a/seahub/options/views.py b/seahub/options/views.py index d810076274..d6fe18f74a 100644 --- a/seahub/options/views.py +++ b/seahub/options/views.py @@ -1,7 +1,7 @@ # Copyright (c) 2012-2016 Seafile Ltd. # -*- coding: utf-8 -*- from django.http import HttpResponse, HttpResponseBadRequest, \ - HttpResponseRedirect , Http404 + HttpResponseRedirect, Http404 from django.views.decorators.http import require_POST from django.contrib import messages from django.utils.translation import ugettext as _ @@ -25,11 +25,11 @@ def save_options(request): else: UserOptions.objects.disable_server_crypto(username) - next = request.META.get('HTTP_REFERER', None) - if next is None: - next = SITE_ROOT + next_page = request.META.get('HTTP_REFERER', None) + if next_page is None: + next_page = SITE_ROOT - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) @login_required @require_POST @@ -47,8 +47,8 @@ def sub_lib_enable_set(request): else: UserOptions.objects.disable_sub_lib(username) - next = request.META.get('HTTP_REFERER', None) - if next is None: - next = SITE_ROOT + next_page = request.META.get('HTTP_REFERER', None) + if next_page is None: + next_page = SITE_ROOT - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) diff --git a/seahub/po.py b/seahub/po.py index f334858097..f03ad357ef 100644 --- a/seahub/po.py +++ b/seahub/po.py @@ -2,14 +2,14 @@ # encoding: utf-8 TRANSLATION_MAP = { - 'Added' : u'添加了', - 'Deleted' : u'删除了', - 'Removed' : u'删除了', - 'Modified' : u'修改了', - 'Renamed' : u'重命名或移动了', - 'Moved' : u'移动了', - 'Added directory' : u'新建了目录', - 'Removed directory' : u'删除了目录', - 'Renamed directory' : u'重命名了目录', - 'Moved directory' : u'移动了目录', + 'Added': '添加了', + 'Deleted': '删除了', + 'Removed': '删除了', + 'Modified': '修改了', + 'Renamed': '重命名或移动了', + 'Moved': '移动了', + 'Added directory': '新建了目录', + 'Removed directory': '删除了目录', + 'Renamed directory': '重命名了目录', + 'Moved directory': '移动了目录', } diff --git a/seahub/profile/forms.py b/seahub/profile/forms.py index 65432116c8..ba44c5e066 100644 --- a/seahub/profile/forms.py +++ b/seahub/profile/forms.py @@ -21,10 +21,10 @@ class ProfileForm(forms.Form): Validates that nickname should not include '/' """ if not ENABLE_UPDATE_USER_INFO: - raise forms.ValidationError(_(u"Permission denied.")) + raise forms.ValidationError(_("Permission denied.")) if "/" in self.cleaned_data["nickname"]: - raise forms.ValidationError(_(u"Name should not include '/'.")) + raise forms.ValidationError(_("Name should not include '/'.")) return self.cleaned_data["nickname"] diff --git a/seahub/profile/migrations/0001_initial.py b/seahub/profile/migrations/0001_initial.py index e31ea15583..1b1d9bd759 100644 --- a/seahub/profile/migrations/0001_initial.py +++ b/seahub/profile/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:33 -from __future__ import unicode_literals + from django.db import migrations, models import seahub.base.fields diff --git a/seahub/profile/migrations/0002_auto_20190122_0225.py b/seahub/profile/migrations/0002_auto_20190122_0225.py index bcdd052023..15d636f0a6 100644 --- a/seahub/profile/migrations/0002_auto_20190122_0225.py +++ b/seahub/profile/migrations/0002_auto_20190122_0225.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2019-01-22 02:25 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/profile/tests.py b/seahub/profile/tests.py index 114eb031ba..b8f2b9c5bd 100644 --- a/seahub/profile/tests.py +++ b/seahub/profile/tests.py @@ -13,7 +13,7 @@ class SimpleTest(TestCase): """ Tests that 1 + 1 always equals 2. """ - self.failUnlessEqual(1 + 1, 2) + self.assertEqual(1 + 1, 2) __test__ = {"doctest": """ Another way to test that 1 + 1 is equal to 2. diff --git a/seahub/profile/utils.py b/seahub/profile/utils.py index 604f7ae69f..ec1393c037 100644 --- a/seahub/profile/utils.py +++ b/seahub/profile/utils.py @@ -1,8 +1,8 @@ # Copyright (c) 2012-2016 Seafile Ltd. from django.core.cache import cache -from models import Profile -from settings import NICKNAME_CACHE_PREFIX, NICKNAME_CACHE_TIMEOUT, \ +from .models import Profile +from .settings import NICKNAME_CACHE_PREFIX, NICKNAME_CACHE_TIMEOUT, \ CONTACT_CACHE_TIMEOUT, CONTACT_CACHE_PREFIX from seahub.shortcuts import get_first_object_or_none from seahub.utils import normalize_cache_key diff --git a/seahub/profile/views.py b/seahub/profile/views.py index 67bb203153..0830c12c41 100644 --- a/seahub/profile/views.py +++ b/seahub/profile/views.py @@ -11,8 +11,8 @@ from django.utils.translation import ugettext as _ import seaserv from seaserv import seafile_api -from forms import DetailedProfileForm -from models import Profile, DetailedProfile +from .forms import DetailedProfileForm +from .models import Profile, DetailedProfile from seahub.auth.decorators import login_required from seahub.utils import is_org_context, is_pro_version, is_valid_username from seahub.base.accounts import User, UNUSABLE_PASSWORD @@ -37,11 +37,11 @@ def edit_profile(request): form = form_class(user=request.user, data=request.POST) if form.is_valid(): form.save() - messages.success(request, _(u'Successfully edited profile.')) + messages.success(request, _('Successfully edited profile.')) return HttpResponseRedirect(reverse('edit_profile')) else: - messages.error(request, _(u'Failed to edit profile')) + messages.error(request, _('Failed to edit profile')) else: profile = Profile.objects.get_profile_by_user(username) d_profile = DetailedProfile.objects.get_detailed_profile_by_user( @@ -75,7 +75,7 @@ def edit_profile(request): default_repo = None owned_repos = get_owned_repo_list(request) - owned_repos = filter(lambda r: not r.is_virtual, owned_repos) + owned_repos = [r for r in owned_repos if not r.is_virtual] if settings.ENABLE_WEBDAV_SECRET: decoded = UserOptions.objects.get_webdav_decoded_secret(username) @@ -89,7 +89,6 @@ def edit_profile(request): if work_weixin_oauth_check(): enable_wechat_work = True - # from social_django.models import UserSocialAuth from seahub.auth.models import SocialAuthUser from seahub.work_weixin.settings import WORK_WEIXIN_PROVIDER social_connected = SocialAuthUser.objects.filter( @@ -187,7 +186,7 @@ def get_user_profile(request, user): data['user_nickname'] = profile.nickname data['user_intro'] = profile.intro else: - data['user_intro'] = _(u'Has not accepted invitation yet') + data['user_intro'] = _('Has not accepted invitation yet') if user == request.user.username or \ Contact.objects.filter(user_email=request.user.username, @@ -201,9 +200,9 @@ def get_user_profile(request, user): @login_required def delete_user_account(request): if not ENABLE_DELETE_ACCOUNT: - messages.error(request, _(u'Permission denied.')) - next = request.META.get('HTTP_REFERER', settings.SITE_ROOT) - return HttpResponseRedirect(next) + messages.error(request, _('Permission denied.')) + next_page = request.META.get('HTTP_REFERER', settings.SITE_ROOT) + return HttpResponseRedirect(next_page) if request.method != 'POST': raise Http404 @@ -211,9 +210,9 @@ def delete_user_account(request): username = request.user.username if username == 'demo@seafile.com': - messages.error(request, _(u'Demo account can not be deleted.')) - next = request.META.get('HTTP_REFERER', settings.SITE_ROOT) - return HttpResponseRedirect(next) + messages.error(request, _('Demo account can not be deleted.')) + next_page = request.META.get('HTTP_REFERER', settings.SITE_ROOT) + return HttpResponseRedirect(next_page) user = User.objects.get(email=username) user.delete() @@ -233,18 +232,18 @@ def default_repo(request): repo_id = request.POST.get('dst_repo', '') referer = request.META.get('HTTP_REFERER', None) - next = settings.SITE_ROOT if referer is None else referer + next_page = settings.SITE_ROOT if referer is None else referer repo = seafile_api.get_repo(repo_id) if repo is None: messages.error(request, _('Failed to set default library.')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) if repo.encrypted: messages.error(request, _('Can not set encrypted library as default library.')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) username = request.user.username UserOptions.objects.set_default_repo(username, repo.id) messages.success(request, _('Successfully set "%s" as your default library.') % repo.name) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) diff --git a/seahub/related_files/apps.py b/seahub/related_files/apps.py index 1f2392d390..1c3c3c9d89 100644 --- a/seahub/related_files/apps.py +++ b/seahub/related_files/apps.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.apps import AppConfig diff --git a/seahub/related_files/migrations/0001_initial.py b/seahub/related_files/migrations/0001_initial.py index b67415aaf6..3526212223 100644 --- a/seahub/related_files/migrations/0001_initial.py +++ b/seahub/related_files/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-11-23 03:32 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/seahub/related_files/models.py b/seahub/related_files/models.py index d66fa32509..7c257a0450 100644 --- a/seahub/related_files/models.py +++ b/seahub/related_files/models.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + import os from django.db import models diff --git a/seahub/repo_tags/migrations/0001_initial.py b/seahub/repo_tags/migrations/0001_initial.py index a8fbe786a8..ad664db36b 100644 --- a/seahub/repo_tags/migrations/0001_initial.py +++ b/seahub/repo_tags/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-10-16 12:42 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/repo_tags/models.py b/seahub/repo_tags/models.py index 9f827cbacb..7da6f05b46 100644 --- a/seahub/repo_tags/models.py +++ b/seahub/repo_tags/models.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import models diff --git a/seahub/revision_tag/migrations/0001_initial.py b/seahub/revision_tag/migrations/0001_initial.py index efb1567d22..0048d4db7d 100644 --- a/seahub/revision_tag/migrations/0001_initial.py +++ b/seahub/revision_tag/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:44 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/seahub/role_permissions/migrations/0001_initial.py b/seahub/role_permissions/migrations/0001_initial.py index 4c442ada71..75c4071743 100644 --- a/seahub/role_permissions/migrations/0001_initial.py +++ b/seahub/role_permissions/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/role_permissions/settings.py b/seahub/role_permissions/settings.py index b651329df6..0c24840a2d 100644 --- a/seahub/role_permissions/settings.py +++ b/seahub/role_permissions/settings.py @@ -124,15 +124,15 @@ except AttributeError: def get_enabled_admin_role_permissions(): permissions = {} - for role, perms in admin_role_permissions.iteritems(): + for role, perms in admin_role_permissions.items(): # check admin role permission syntax default_admin_permissions = DEFAULT_ENABLED_ADMIN_ROLE_PERMISSIONS[DEFAULT_ADMIN] - for k in perms.keys(): - if k not in default_admin_permissions.keys(): + for k in list(perms.keys()): + if k not in list(default_admin_permissions.keys()): logger.warn('"%s" is not valid permission, please review the ENABLED_ADMIN_ROLE_PERMISSIONS setting.' % k) all_false_permission = {} - for permission in default_admin_permissions.keys(): + for permission in list(default_admin_permissions.keys()): all_false_permission[permission] = False all_false_permission.update(perms) diff --git a/seahub/role_permissions/utils.py b/seahub/role_permissions/utils.py index a64ea5bc21..c65a6eda01 100644 --- a/seahub/role_permissions/utils.py +++ b/seahub/role_permissions/utils.py @@ -10,7 +10,7 @@ logger = logging.getLogger(__name__) def get_available_roles(): """Get available roles defined in `ENABLED_ROLE_PERMISSIONS`. """ - return ENABLED_ROLE_PERMISSIONS.keys() + return list(ENABLED_ROLE_PERMISSIONS.keys()) def get_enabled_role_permissions_by_role(role): """Get permissions dict(perm_name: bool) of a role. @@ -18,7 +18,7 @@ def get_enabled_role_permissions_by_role(role): if not role: role = DEFAULT_USER - if role not in ENABLED_ROLE_PERMISSIONS.keys(): + if role not in list(ENABLED_ROLE_PERMISSIONS.keys()): logger.warn('%s is not a valid role, use default role.' % role) role = DEFAULT_USER @@ -27,7 +27,7 @@ def get_enabled_role_permissions_by_role(role): def get_available_admin_roles(): """Get available admin roles defined in `ENABLED_ADMIN_ROLE_PERMISSIONS`. """ - return ENABLED_ADMIN_ROLE_PERMISSIONS.keys() + return list(ENABLED_ADMIN_ROLE_PERMISSIONS.keys()) def get_enabled_admin_role_permissions_by_role(role): """Get permissions dict(perm_name: bool) of a admin role. @@ -36,7 +36,7 @@ def get_enabled_admin_role_permissions_by_role(role): if not role: role = DEFAULT_ADMIN - if role not in ENABLED_ADMIN_ROLE_PERMISSIONS.keys(): + if role not in list(ENABLED_ADMIN_ROLE_PERMISSIONS.keys()): logger.warn('%s is not a valid admin role, use default admin role.' % role) role = DEFAULT_ADMIN diff --git a/seahub/settings.py b/seahub/settings.py index dc8d0621c8..bb40be3dfb 100644 --- a/seahub/settings.py +++ b/seahub/settings.py @@ -127,7 +127,6 @@ MIDDLEWARE_CLASSES = ( 'seahub.two_factor.middleware.OTPMiddleware', 'seahub.two_factor.middleware.ForceTwoFactorAuthMiddleware', 'seahub.trusted_ip.middleware.LimitIpMiddleware', - 'social_django.middleware.SocialAuthExceptionMiddleware', ) @@ -155,9 +154,6 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.messages.context_processors.messages', - 'social_django.context_processors.backends', - 'social_django.context_processors.login_redirect', - 'seahub.auth.context_processors.auth', 'seahub.base.context_processors.base', 'seahub.base.context_processors.debug', @@ -169,8 +165,8 @@ TEMPLATES = [ LANGUAGES = ( # ('bg', gettext_noop(u'български език')), - ('ca', u'Català'), - ('cs', u'Čeština'), + ('ca', 'Català'), + ('cs', 'Čeština'), ('de', 'Deutsch'), ('en', 'English'), ('es', 'Español'), @@ -229,7 +225,6 @@ INSTALLED_APPS = ( 'post_office', 'termsandconditions', 'webpack_loader', - 'social_django', 'seahub.api2', 'seahub.avatar', @@ -277,29 +272,9 @@ CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend' CONSTANCE_DATABASE_CACHE_BACKEND = 'default' AUTHENTICATION_BACKENDS = ( - 'seahub.social_core.backends.weixin_enterprise.WeixinWorkOAuth2', 'seahub.base.accounts.AuthBackend', ) -SOCIAL_AUTH_URL_NAMESPACE = 'social' -SOCIAL_AUTH_VERIFY_SSL = True -SOCIAL_AUTH_LOGIN_ERROR_URL = '/profile/' -SOCIAL_AUTH_WEIXIN_WORK_AGENTID = '' -SOCIAL_AUTH_WEIXIN_WORK_KEY = '' -SOCIAL_AUTH_WEIXIN_WORK_SECRET = '' -SOCIAL_AUTH_PIPELINE = ( - 'social_core.pipeline.social_auth.social_details', - 'social_core.pipeline.social_auth.social_uid', - 'social_core.pipeline.social_auth.auth_allowed', - 'seahub.social_core.pipeline.social_auth.social_user', - 'seahub.social_core.pipeline.user.get_username', - 'seahub.social_core.pipeline.user.create_user', - 'seahub.social_core.pipeline.social_auth.associate_user', - 'social_core.pipeline.social_auth.load_extra_data', - # 'social_core.pipeline.user.user_details', - 'seahub.social_core.pipeline.user.save_profile', -) - ENABLE_OAUTH = False ENABLE_WATERMARK = False @@ -878,31 +853,31 @@ INNER_FILE_SERVER_ROOT = 'http://127.0.0.1:' + FILE_SERVER_PORT CONSTANCE_ENABLED = ENABLE_SETTINGS_VIA_WEB CONSTANCE_CONFIG = { - 'SERVICE_URL': (SERVICE_URL,''), - 'FILE_SERVER_ROOT': (FILE_SERVER_ROOT,''), - 'DISABLE_SYNC_WITH_ANY_FOLDER': (DISABLE_SYNC_WITH_ANY_FOLDER,''), + 'SERVICE_URL': (SERVICE_URL, ''), + 'FILE_SERVER_ROOT': (FILE_SERVER_ROOT, ''), + 'DISABLE_SYNC_WITH_ANY_FOLDER': (DISABLE_SYNC_WITH_ANY_FOLDER, ''), - 'ENABLE_SIGNUP': (ENABLE_SIGNUP,''), - 'ACTIVATE_AFTER_REGISTRATION': (ACTIVATE_AFTER_REGISTRATION,''), - 'REGISTRATION_SEND_MAIL': (REGISTRATION_SEND_MAIL ,''), - 'LOGIN_REMEMBER_DAYS': (LOGIN_REMEMBER_DAYS,''), + 'ENABLE_SIGNUP': (ENABLE_SIGNUP, ''), + 'ACTIVATE_AFTER_REGISTRATION': (ACTIVATE_AFTER_REGISTRATION, ''), + 'REGISTRATION_SEND_MAIL': (REGISTRATION_SEND_MAIL, ''), + 'LOGIN_REMEMBER_DAYS': (LOGIN_REMEMBER_DAYS, ''), 'LOGIN_ATTEMPT_LIMIT': (LOGIN_ATTEMPT_LIMIT, ''), 'FREEZE_USER_ON_LOGIN_FAILED': (FREEZE_USER_ON_LOGIN_FAILED, ''), 'ENABLE_USER_CREATE_ORG_REPO': (ENABLE_USER_CREATE_ORG_REPO, ''), - 'ENABLE_ENCRYPTED_LIBRARY': (ENABLE_ENCRYPTED_LIBRARY,''), - 'REPO_PASSWORD_MIN_LENGTH': (REPO_PASSWORD_MIN_LENGTH,''), - 'ENABLE_REPO_HISTORY_SETTING': (ENABLE_REPO_HISTORY_SETTING,''), + 'ENABLE_ENCRYPTED_LIBRARY': (ENABLE_ENCRYPTED_LIBRARY, ''), + 'REPO_PASSWORD_MIN_LENGTH': (REPO_PASSWORD_MIN_LENGTH, ''), + 'ENABLE_REPO_HISTORY_SETTING': (ENABLE_REPO_HISTORY_SETTING, ''), 'FORCE_PASSWORD_CHANGE': (FORCE_PASSWORD_CHANGE, ''), - 'USER_STRONG_PASSWORD_REQUIRED': (USER_STRONG_PASSWORD_REQUIRED,''), - 'USER_PASSWORD_MIN_LENGTH': (USER_PASSWORD_MIN_LENGTH,''), - 'USER_PASSWORD_STRENGTH_LEVEL': (USER_PASSWORD_STRENGTH_LEVEL,''), + 'USER_STRONG_PASSWORD_REQUIRED': (USER_STRONG_PASSWORD_REQUIRED, ''), + 'USER_PASSWORD_MIN_LENGTH': (USER_PASSWORD_MIN_LENGTH, ''), + 'USER_PASSWORD_STRENGTH_LEVEL': (USER_PASSWORD_STRENGTH_LEVEL, ''), 'SHARE_LINK_TOKEN_LENGTH': (SHARE_LINK_TOKEN_LENGTH, ''), - 'SHARE_LINK_PASSWORD_MIN_LENGTH': (SHARE_LINK_PASSWORD_MIN_LENGTH,''), - 'ENABLE_TWO_FACTOR_AUTH': (ENABLE_TWO_FACTOR_AUTH,''), + 'SHARE_LINK_PASSWORD_MIN_LENGTH': (SHARE_LINK_PASSWORD_MIN_LENGTH, ''), + 'ENABLE_TWO_FACTOR_AUTH': (ENABLE_TWO_FACTOR_AUTH, ''), 'TEXT_PREVIEW_EXT': (TEXT_PREVIEW_EXT, ''), 'ENABLE_SHARE_TO_ALL_GROUPS': (ENABLE_SHARE_TO_ALL_GROUPS, ''), diff --git a/seahub/share/migrations/0001_initial.py b/seahub/share/migrations/0001_initial.py index a7f8c565f5..feb0040099 100644 --- a/seahub/share/migrations/0001_initial.py +++ b/seahub/share/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:43 -from __future__ import unicode_literals + import datetime from django.db import migrations, models diff --git a/seahub/share/models.py b/seahub/share/models.py index 6291cc5683..11d1a4b9e3 100644 --- a/seahub/share/models.py +++ b/seahub/share/models.py @@ -15,6 +15,7 @@ from seahub.utils import normalize_file_path, normalize_dir_path, gen_token,\ get_service_url from seahub.constants import PERMISSION_READ, PERMISSION_ADMIN from seahub.utils import is_valid_org_id +from functools import reduce # Get an instance of a logger logger = logging.getLogger(__name__) diff --git a/seahub/share/tests.py b/seahub/share/tests.py index 114eb031ba..b8f2b9c5bd 100644 --- a/seahub/share/tests.py +++ b/seahub/share/tests.py @@ -13,7 +13,7 @@ class SimpleTest(TestCase): """ Tests that 1 + 1 always equals 2. """ - self.failUnlessEqual(1 + 1, 2) + self.assertEqual(1 + 1, 2) __test__ = {"doctest": """ Another way to test that 1 + 1 is equal to 2. diff --git a/seahub/share/urls.py b/seahub/share/urls.py index 711731f23c..5671be8235 100644 --- a/seahub/share/urls.py +++ b/seahub/share/urls.py @@ -1,7 +1,7 @@ # Copyright (c) 2012-2016 Seafile Ltd. from django.conf.urls import url -from views import * +from .views import * urlpatterns = [ url(r'^link/send/$', send_shared_link, name='send_shared_link'), diff --git a/seahub/share/views.py b/seahub/share/views.py index b6389ee149..87e8ea4214 100644 --- a/seahub/share/views.py +++ b/seahub/share/views.py @@ -79,7 +79,7 @@ def share_to_group(request, repo, group, permission): seafile_api.set_group_repo(repo_id, group_id, from_user, permission) return True - except Exception, e: + except Exception as e: logger.error(e) return False @@ -131,7 +131,7 @@ def send_shared_link(request): content_type = 'application/json; charset=utf-8' if not IS_EMAIL_CONFIGURED: - data = json.dumps({'error':_(u'Sending shared link failed. Email service is not properly configured, please contact administrator.')}) + data = json.dumps({'error':_('Sending shared link failed. Email service is not properly configured, please contact administrator.')}) return HttpResponse(data, status=500, content_type=content_type) form = FileLinkShareForm(request.POST) @@ -180,15 +180,15 @@ def send_shared_link(request): try: if file_shared_type == 'f': - c['file_shared_type'] = _(u"file") - send_html_email(_(u'A file is shared to you on %s') % get_site_name(), + c['file_shared_type'] = _("file") + send_html_email(_('A file is shared to you on %s') % get_site_name(), 'shared_link_email.html', c, from_email, [to_email], reply_to=reply_to ) else: - c['file_shared_type'] = _(u"directory") - send_html_email(_(u'A directory is shared to you on %s') % get_site_name(), + c['file_shared_type'] = _("directory") + send_html_email(_('A directory is shared to you on %s') % get_site_name(), 'shared_link_email.html', c, from_email, [to_email], reply_to=reply_to) @@ -216,17 +216,17 @@ def save_shared_link(request): dst_repo_id = request.POST.get('dst_repo', '') dst_path = request.POST.get('dst_path', '') - next = request.META.get('HTTP_REFERER', None) - if not next: - next = SITE_ROOT + next_page = request.META.get('HTTP_REFERER', None) + if not next_page: + next_page = SITE_ROOT if not dst_repo_id or not dst_path: - messages.error(request, _(u'Please choose a directory.')) - return HttpResponseRedirect(next) + messages.error(request, _('Please choose a directory.')) + return HttpResponseRedirect(next_page) if check_folder_permission(request, dst_repo_id, dst_path) != 'rw': messages.error(request, _('Permission denied')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) try: fs = FileShare.objects.get(token=token) @@ -243,8 +243,8 @@ def save_shared_link(request): dst_repo_id, dst_path, new_obj_name, username, need_progress=0) - messages.success(request, _(u'Successfully saved.')) - return HttpResponseRedirect(next) + messages.success(request, _('Successfully saved.')) + return HttpResponseRedirect(next_page) @login_required_ajax def send_shared_upload_link(request): @@ -257,7 +257,7 @@ def send_shared_upload_link(request): content_type = 'application/json; charset=utf-8' if not IS_EMAIL_CONFIGURED: - data = json.dumps({'error':_(u'Sending shared upload link failed. Email service is not properly configured, please contact administrator.')}) + data = json.dumps({'error':_('Sending shared upload link failed. Email service is not properly configured, please contact administrator.')}) return HttpResponse(data, status=500, content_type=content_type) form = UploadLinkShareForm(request.POST) @@ -298,7 +298,7 @@ def send_shared_upload_link(request): reply_to = None try: - send_html_email(_(u'An upload link is shared to you on %s') % get_site_name(), + send_html_email(_('An upload link is shared to you on %s') % get_site_name(), 'shared_upload_link_email.html', c, from_email, [to_email], reply_to=reply_to) @@ -329,11 +329,11 @@ def ajax_private_share_dir(request): repo = seafile_api.get_repo(repo_id) if not repo: - result['error'] = _(u'Library does not exist.') + result['error'] = _('Library does not exist.') return HttpResponse(json.dumps(result), status=400, content_type=content_type) if seafile_api.get_dir_id_by_path(repo_id, path) is None: - result['error'] = _(u'Directory does not exist.') + result['error'] = _('Directory does not exist.') return HttpResponse(json.dumps(result), status=400, content_type=content_type) if path != '/': @@ -382,7 +382,7 @@ def ajax_private_share_dir(request): # Test whether user is the repo owner. if not seafile_api.is_repo_owner(username, shared_repo_id) and \ not is_org_repo_owner(username, shared_repo_id): - result['error'] = _(u'Only the owner of the library has permission to share it.') + result['error'] = _('Only the owner of the library has permission to share it.') return HttpResponse(json.dumps(result), status=500, content_type=content_type) # Parsing input values. diff --git a/seahub/social_core/backends/__init__.py b/seahub/social_core/backends/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/seahub/social_core/backends/weixin_enterprise.py b/seahub/social_core/backends/weixin_enterprise.py deleted file mode 100644 index 69bb05e0c0..0000000000 --- a/seahub/social_core/backends/weixin_enterprise.py +++ /dev/null @@ -1,198 +0,0 @@ -import urllib -from requests import HTTPError - -from django.conf import settings - -from social_core.backends.oauth import BaseOAuth2 -from social_core.exceptions import AuthCanceled, AuthUnknownError - -import logging -logger = logging.getLogger(__name__) - -try: - WEIXIN_WORK_SP = True if settings.SOCIAL_AUTH_WEIXIN_WORK_SUITID else False -except AttributeError: - WEIXIN_WORK_SP = False - -if WEIXIN_WORK_SP is True: - _AUTHORIZATION_URL = 'https://open.work.weixin.qq.com/wwopen/sso/3rd_qrConnect' - _ACCESS_TOKEN_URL = 'https://qyapi.weixin.qq.com/cgi-bin/service/get_provider_token' - _USER_INFO_URL = 'https://qyapi.weixin.qq.com/cgi-bin/service/get_login_info' -else: - _AUTHORIZATION_URL = 'https://open.work.weixin.qq.com/wwopen/sso/qrConnect' - _ACCESS_TOKEN_URL = 'https://qyapi.weixin.qq.com/cgi-bin/gettoken' - _USER_INFO_URL = 'https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo' - - -class WeixinWorkOAuth2(BaseOAuth2): - """WeChat Work OAuth authentication backend""" - name = 'weixin-work' - ID_KEY = 'UserId' - AUTHORIZATION_URL = _AUTHORIZATION_URL - ACCESS_TOKEN_URL = _ACCESS_TOKEN_URL - ACCESS_TOKEN_METHOD = 'POST' - DEFAULT_SCOPE = ['snsapi_login'] - REDIRECT_STATE = False - EXTRA_DATA = [ - ('nickname', 'username'), - ('headimgurl', 'profile_image_url'), - ] - - def extra_data(self, user, uid, response, details=None, *args, **kwargs): - data = super(BaseOAuth2, self).extra_data(user, uid, response, - details=details, - *args, **kwargs) - - if WEIXIN_WORK_SP: - data['corp_info'] = response.get('corp_info') - data['user_info'] = response.get('user_info') - - return data - - def get_user_id(self, details, response): - """Return a unique ID for the current user, by default from server - response.""" - if WEIXIN_WORK_SP: - return response.get('user_info').get('userid') - else: - return response.get(self.ID_KEY) - - def get_user_details(self, response): - """Return user details from Weixin. API URL is: - https://api.weixin.qq.com/sns/userinfo - """ - if WEIXIN_WORK_SP: - user_info = response.get('user_info') - return { - 'userid': user_info.get('userid'), - 'user_name': user_info.get('name'), - 'user_avatar': user_info.get('avatar'), - 'corpid': response.get('corp_info').get('corpid'), - } - else: - if self.setting('DOMAIN_AS_USERNAME'): - username = response.get('domain', '') - else: - username = response.get('nickname', '') - return { - 'username': username, - 'profile_image_url': response.get('headimgurl', '') - } - - def user_data(self, access_token, *args, **kwargs): - if WEIXIN_WORK_SP: - data = self.get_json(_USER_INFO_URL, - params={'access_token': access_token}, - json={'auth_code': kwargs['request'].GET.get('auth_code')}, - headers={'Content-Type': 'application/json', - 'Accept': 'application/json'}, - method='post') - - else: - data = self.get_json(_USER_INFO_URL, params={ - 'access_token': access_token, - 'code': kwargs['request'].GET.get('code') - }) - - nickname = data.get('nickname') - if nickname: - # weixin api has some encode bug, here need handle - data['nickname'] = nickname.encode( - 'raw_unicode_escape' - ).decode('utf-8') - - return data - - def auth_params(self, state=None): - appid, secret = self.get_key_and_secret() - - if WEIXIN_WORK_SP: - params = { - 'appid': appid, - 'redirect_uri': self.get_redirect_uri(state), - 'usertype': 'member', - } - else: - params = { - 'appid': appid, - 'redirect_uri': self.get_redirect_uri(state), - 'agentid': self.setting('AGENTID'), - } - - if self.STATE_PARAMETER and state: - params['state'] = state - if self.RESPONSE_TYPE: - params['response_type'] = self.RESPONSE_TYPE - return params - - def auth_complete_params(self, state=None): - appid, secret = self.get_key_and_secret() - if WEIXIN_WORK_SP is True: - return { - 'corpid': appid, - 'provider_secret': secret, - } - - return { - 'grant_type': 'authorization_code', # request auth code - 'code': self.data.get('code', ''), # server response code - 'appid': appid, - 'secret': secret, - 'redirect_uri': self.get_redirect_uri(state), - } - - def refresh_token_params(self, token, *args, **kwargs): - appid, secret = self.get_key_and_secret() - return { - 'refresh_token': token, - 'grant_type': 'refresh_token', - 'appid': appid, - 'secret': secret - } - - def access_token_url(self, appid, secret): - if WEIXIN_WORK_SP: - return self.ACCESS_TOKEN_URL - else: - return self.ACCESS_TOKEN_URL + '?corpid=%s&corpsecret=%s' % (appid, secret) - - def auth_complete(self, *args, **kwargs): - """Completes loging process, must return user instance""" - self.process_error(self.data) - - appid, secret = self.get_key_and_secret() - try: - if WEIXIN_WORK_SP: - response = self.request_access_token( - self.access_token_url(appid, secret), - json=self.auth_complete_params(self.validate_state()), - headers={'Content-Type': 'application/json', - 'Accept': 'application/json'}, - method=self.ACCESS_TOKEN_METHOD - ) - else: - response = self.request_access_token( - self.access_token_url(appid, secret), - data=self.auth_complete_params(self.validate_state()), - headers=self.auth_headers(), - method=self.ACCESS_TOKEN_METHOD - ) - except HTTPError as err: - if err.response.status_code == 400: - raise AuthCanceled(self, response=err.response) - else: - raise - except KeyError: - raise AuthUnknownError(self) - - try: - if response['errmsg'] != 'ok': - raise AuthCanceled(self) - except KeyError: - pass # assume response is ok if 'errmsg' key not found - - self.process_error(response) - - access_token = response['provider_access_token'] if WEIXIN_WORK_SP else response['access_token'] - return self.do_auth(access_token, response=response, - *args, **kwargs) diff --git a/seahub/social_core/pipeline/__init__.py b/seahub/social_core/pipeline/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/seahub/social_core/pipeline/social_auth.py b/seahub/social_core/pipeline/social_auth.py deleted file mode 100644 index efc9fed943..0000000000 --- a/seahub/social_core/pipeline/social_auth.py +++ /dev/null @@ -1,34 +0,0 @@ -from social_core.exceptions import AuthAlreadyAssociated - -def social_user(backend, uid, user=None, *args, **kwargs): - provider = backend.name - social = backend.strategy.storage.user.get_social_auth(provider, uid) - if social: - if user and social.user.username != user.username: - msg = 'This {0} account is already in use.'.format(provider) - raise AuthAlreadyAssociated(backend, msg) - elif not user: - user = social.user - return {'social': social, - 'user': user, - 'is_new': user is None, - 'new_association': social is None} - - -def associate_user(backend, uid, user=None, social=None, *args, **kwargs): - if user and not social: - try: - social = backend.strategy.storage.user.create_social_auth( - user, uid, backend.name - ) - except Exception as err: - if not backend.strategy.storage.is_integrity_error(err): - raise - # Protect for possible race condition, those bastard with FTL - # clicking capabilities, check issue #131: - # https://github.com/omab/django-social-auth/issues/131 - return social_user(backend, uid, user, *args, **kwargs) - else: - return {'social': social, - 'user': user, - 'new_association': True} diff --git a/seahub/social_core/pipeline/user.py b/seahub/social_core/pipeline/user.py deleted file mode 100644 index f25cf06fc3..0000000000 --- a/seahub/social_core/pipeline/user.py +++ /dev/null @@ -1,87 +0,0 @@ -from seahub.profile.models import Profile -from seahub.utils.auth import gen_user_virtual_id - -USER_FIELDS = ['username', 'email'] - - -def get_username(strategy, details, backend, user=None, *args, **kwargs): - if 'username' not in backend.setting('USER_FIELDS', USER_FIELDS): - return - storage = strategy.storage - - if not user: - final_username = gen_user_virtual_id() - else: - final_username = storage.user.get_username(user) - - return {'username': final_username} - - -def create_user(strategy, details, backend, user=None, *args, **kwargs): - if user: - return {'is_new': False} - - fields = dict((name, kwargs.get(name, details.get(name))) - for name in backend.setting('USER_FIELDS', USER_FIELDS)) - if not fields: - return - - return { - 'is_new': True, - 'user': strategy.create_user(**fields) - } - - - -def save_profile(strategy, details, backend, user=None, *args, **kwargs): - if not user: - return - email = details.get('email', '') - if email: - Profile.objects.add_or_update(username=user.username, - contact_email=email) - - fullname = details.get('fullname', '') - if fullname: - Profile.objects.add_or_update(username=user.username, - nickname=fullname) - - # weixin username and profile_image_url - nickname = details.get('username', '') - if nickname: - Profile.objects.add_or_update(username=user.username, - nickname=nickname) - - avatar_url = details.get('profile_image_url', '') - if avatar_url: - _update_user_avatar(user, avatar_url) - -import os -import logging -import urllib2 -from django.core.files import File -from seahub.avatar.models import Avatar -from seahub.avatar.signals import avatar_updated -logger = logging.getLogger(__name__) - -def _update_user_avatar(user, pic): - if not pic: - return - - logger.info("retrieve pic from %s" % pic) - - filedata = urllib2.urlopen(pic) - datatowrite = filedata.read() - filename = '/tmp/%s.jpg' % user.username - with open(filename, 'wb') as f: - f.write(datatowrite) - - logger.info("save pic to %s" % filename) - avatar = Avatar(emailuser=user.username, primary=True) - avatar.avatar.save( - 'image.jpg', File(open(filename)) - ) - avatar.save() - avatar_updated.send(sender=Avatar, user=user, avatar=avatar) - - os.remove(filename) diff --git a/seahub/social_core/utils/WXBizMsgCrypt.py b/seahub/social_core/utils/WXBizMsgCrypt.py deleted file mode 100644 index 3b515d3430..0000000000 --- a/seahub/social_core/utils/WXBizMsgCrypt.py +++ /dev/null @@ -1,275 +0,0 @@ -#!/usr/bin/env python -#-*- encoding:utf-8 -*- - -""" 对企业微信发送给企业后台的消息加解密示例代码. -@copyright: Copyright (c) 1998-2014 Tencent Inc. - -""" -# ------------------------------------------------------------------------ - -import base64 -import string -import random -import hashlib -import time -import struct -try: - from Crypto.Cipher import AES -except ImportError: - AES = None -import xml.etree.cElementTree as ET -import sys -import socket -reload(sys) -from . import ierror -sys.setdefaultencoding('utf-8') - -""" -关于Crypto.Cipher模块，ImportError: No module named 'Crypto'解决方案 -请到官方网站 https://www.dlitz.net/software/pycrypto/ 下载pycrypto。 -下载后，按照README中的“Installation”小节的提示进行pycrypto安装。 -""" -class FormatException(Exception): - pass - -def throw_exception(message, exception_class=FormatException): - """my define raise exception function""" - raise exception_class(message) - -class SHA1: - """计算企业微信的消息签名接口""" - - def getSHA1(self, token, timestamp, nonce, encrypt): - """用SHA1算法生成安全签名 - @param token: 票据 - @param timestamp: 时间戳 - @param encrypt: 密文 - @param nonce: 随机字符串 - @return: 安全签名 - """ - try: - sortlist = [token, timestamp, nonce, encrypt] - sortlist.sort() - sha = hashlib.sha1() - sha.update("".join(sortlist)) - return ierror.WXBizMsgCrypt_OK, sha.hexdigest() - except Exception,e: - print e - return ierror.WXBizMsgCrypt_ComputeSignature_Error, None - - -class XMLParse: - """提供提取消息格式中的密文及生成回复消息格式的接口""" - - # xml消息模板 - AES_TEXT_RESPONSE_TEMPLATE = """ - - -%(timestamp)s - -""" - - def extract(self, xmltext): - """提取出xml数据包中的加密消息 - @param xmltext: 待提取的xml字符串 - @return: 提取出的加密消息字符串 - """ - try: - xml_tree = ET.fromstring(xmltext) - encrypt = xml_tree.find("Encrypt") - return ierror.WXBizMsgCrypt_OK, encrypt.text - except Exception,e: - print e - return ierror.WXBizMsgCrypt_ParseXml_Error,None,None - - def generate(self, encrypt, signature, timestamp, nonce): - """生成xml消息 - @param encrypt: 加密后的消息密文 - @param signature: 安全签名 - @param timestamp: 时间戳 - @param nonce: 随机字符串 - @return: 生成的xml字符串 - """ - resp_dict = { - 'msg_encrypt' : encrypt, - 'msg_signaturet': signature, - 'timestamp' : timestamp, - 'nonce' : nonce, - } - resp_xml = self.AES_TEXT_RESPONSE_TEMPLATE % resp_dict - return resp_xml - - -class PKCS7Encoder(): - """提供基于PKCS7算法的加解密接口""" - - block_size = 32 - def encode(self, text): - """ 对需要加密的明文进行填充补位 - @param text: 需要进行填充补位操作的明文 - @return: 补齐明文字符串 - """ - text_length = len(text) - # 计算需要填充的位数 - amount_to_pad = self.block_size - (text_length % self.block_size) - if amount_to_pad == 0: - amount_to_pad = self.block_size - # 获得补位所用的字符 - pad = chr(amount_to_pad) - return text + pad * amount_to_pad - - def decode(self, decrypted): - """删除解密后明文的补位字符 - @param decrypted: 解密后的明文 - @return: 删除补位字符后的明文 - """ - pad = ord(decrypted[-1]) - if pad<1 or pad >32: - pad = 0 - return decrypted[:-pad] - - -class Prpcrypt(object): - """提供接收和推送给企业微信消息的加解密接口""" - - def __init__(self,key): - - #self.key = base64.b64decode(key+"=") - self.key = key - # 设置加解密模式为AES的CBC模式 - self.mode = AES.MODE_CBC - - - def encrypt(self,text,receiveid): - """对明文进行加密 - @param text: 需要加密的明文 - @return: 加密得到的字符串 - """ - # 16位随机字符串添加到明文开头 - text = self.get_random_str() + struct.pack("I",socket.htonl(len(text))) + text + receiveid - # 使用自定义的填充方式对明文进行补位填充 - pkcs7 = PKCS7Encoder() - text = pkcs7.encode(text) - # 加密 - cryptor = AES.new(self.key,self.mode,self.key[:16]) - try: - ciphertext = cryptor.encrypt(text) - # 使用BASE64对加密后的字符串进行编码 - return ierror.WXBizMsgCrypt_OK, base64.b64encode(ciphertext) - except Exception,e: - print e - return ierror.WXBizMsgCrypt_EncryptAES_Error,None - - def decrypt(self,text,receiveid): - """对解密后的明文进行补位删除 - @param text: 密文 - @return: 删除填充补位后的明文 - """ - try: - cryptor = AES.new(self.key,self.mode,self.key[:16]) - # 使用BASE64对密文进行解码，然后AES-CBC解密 - plain_text = cryptor.decrypt(base64.b64decode(text)) - except Exception,e: - print e - return ierror.WXBizMsgCrypt_DecryptAES_Error,None - try: - pad = ord(plain_text[-1]) - # 去掉补位字符串 - #pkcs7 = PKCS7Encoder() - #plain_text = pkcs7.encode(plain_text) - # 去除16位随机字符串 - content = plain_text[16:-pad] - xml_len = socket.ntohl(struct.unpack("I",content[ : 4])[0]) - xml_content = content[4 : xml_len+4] - from_receiveid = content[xml_len+4:] - except Exception,e: - print e - return ierror.WXBizMsgCrypt_IllegalBuffer,None - if from_receiveid != receiveid: - return ierror.WXBizMsgCrypt_ValidateCorpid_Error,None - return 0,xml_content - - def get_random_str(self): - """ 随机生成16位字符串 - @return: 16位字符串 - """ - rule = string.letters + string.digits - str = random.sample(rule, 16) - return "".join(str) - -class WXBizMsgCrypt(object): - #构造函数 - def __init__(self,sToken,sEncodingAESKey,sReceiveId): - try: - self.key = base64.b64decode(sEncodingAESKey+"=") - assert len(self.key) == 32 - except: - throw_exception("[error]: EncodingAESKey unvalid !", FormatException) - # return ierror.WXBizMsgCrypt_IllegalAesKey,None - self.m_sToken = sToken - self.m_sReceiveId = sReceiveId - - #验证URL - #@param sMsgSignature: 签名串，对应URL参数的msg_signature - #@param sTimeStamp: 时间戳，对应URL参数的timestamp - #@param sNonce: 随机串，对应URL参数的nonce - #@param sEchoStr: 随机串，对应URL参数的echostr - #@param sReplyEchoStr: 解密之后的echostr，当return返回0时有效 - #@return：成功0，失败返回对应的错误码 - - def VerifyURL(self, sMsgSignature, sTimeStamp, sNonce, sEchoStr): - sha1 = SHA1() - ret,signature = sha1.getSHA1(self.m_sToken, sTimeStamp, sNonce, sEchoStr) - if ret != 0: - return ret, None - if not signature == sMsgSignature: - return ierror.WXBizMsgCrypt_ValidateSignature_Error, None - pc = Prpcrypt(self.key) - ret,sReplyEchoStr = pc.decrypt(sEchoStr,self.m_sReceiveId) - return ret,sReplyEchoStr - - def EncryptMsg(self, sReplyMsg, sNonce, timestamp = None): - #将企业回复用户的消息加密打包 - #@param sReplyMsg: 企业号待回复用户的消息，xml格式的字符串 - #@param sTimeStamp: 时间戳，可以自己生成，也可以用URL参数的timestamp,如为None则自动用当前时间 - #@param sNonce: 随机串，可以自己生成，也可以用URL参数的nonce - #sEncryptMsg: 加密后的可以直接回复用户的密文，包括msg_signature, timestamp, nonce, encrypt的xml格式的字符串, - #return：成功0，sEncryptMsg,失败返回对应的错误码None - pc = Prpcrypt(self.key) - ret,encrypt = pc.encrypt(sReplyMsg, self.m_sReceiveId) - if ret != 0: - return ret,None - if timestamp is None: - timestamp = str(int(time.time())) - # 生成安全签名 - sha1 = SHA1() - ret,signature = sha1.getSHA1(self.m_sToken, timestamp, sNonce, encrypt) - if ret != 0: - return ret,None - xmlParse = XMLParse() - return ret,xmlParse.generate(encrypt, signature, timestamp, sNonce) - - def DecryptMsg(self, sPostData, sMsgSignature, sTimeStamp, sNonce): - # 检验消息的真实性，并且获取解密后的明文 - # @param sMsgSignature: 签名串，对应URL参数的msg_signature - # @param sTimeStamp: 时间戳，对应URL参数的timestamp - # @param sNonce: 随机串，对应URL参数的nonce - # @param sPostData: 密文，对应POST请求的数据 - # xml_content: 解密后的原文，当return返回0时有效 - # @return: 成功0，失败返回对应的错误码 - # 验证安全签名 - xmlParse = XMLParse() - ret,encrypt = xmlParse.extract(sPostData) - if ret != 0: - return ret, None - sha1 = SHA1() - ret,signature = sha1.getSHA1(self.m_sToken, sTimeStamp, sNonce, encrypt) - if ret != 0: - return ret, None - if not signature == sMsgSignature: - return ierror.WXBizMsgCrypt_ValidateSignature_Error, None - pc = Prpcrypt(self.key) - ret,xml_content = pc.decrypt(encrypt,self.m_sReceiveId) - return ret,xml_content - - diff --git a/seahub/social_core/utils/__init__.py b/seahub/social_core/utils/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/seahub/social_core/utils/ierror.py b/seahub/social_core/utils/ierror.py deleted file mode 100644 index 6678fecfd6..0000000000 --- a/seahub/social_core/utils/ierror.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -######################################################################### -# Author: jonyqin -# Created Time: Thu 11 Sep 2014 01:53:58 PM CST -# File Name: ierror.py -# Description:定义错误码含义 -######################################################################### -WXBizMsgCrypt_OK = 0 -WXBizMsgCrypt_ValidateSignature_Error = -40001 -WXBizMsgCrypt_ParseXml_Error = -40002 -WXBizMsgCrypt_ComputeSignature_Error = -40003 -WXBizMsgCrypt_IllegalAesKey = -40004 -WXBizMsgCrypt_ValidateCorpid_Error = -40005 -WXBizMsgCrypt_EncryptAES_Error = -40006 -WXBizMsgCrypt_DecryptAES_Error = -40007 -WXBizMsgCrypt_IllegalBuffer = -40008 -WXBizMsgCrypt_EncodeBase64_Error = -40009 -WXBizMsgCrypt_DecodeBase64_Error = -40010 -WXBizMsgCrypt_GenReturnXml_Error = -40011 diff --git a/seahub/social_core/views.py b/seahub/social_core/views.py deleted file mode 100644 index 18190ea15a..0000000000 --- a/seahub/social_core/views.py +++ /dev/null @@ -1,145 +0,0 @@ -import logging - -import requests -from django.conf import settings -from django.core.cache import cache -from django.core.urlresolvers import reverse -from django.http import HttpResponse, HttpResponseRedirect -from django.views.decorators.csrf import csrf_exempt -from django.utils.http import urlquote - -from seahub.social_core.utils.WXBizMsgCrypt import WXBizMsgCrypt -from seahub.utils.urls import abs_reverse - -# Get an instance of a logger -logger = logging.getLogger(__name__) - -@csrf_exempt -def weixin_work_cb(request): - """Callback for weixin work provider API. - - Used in callback config at app details page. - e.g. https://open.work.weixin.qq.com/wwopen/developer#/sass/apps/detail/ww24c53566499d354f - - ref: https://work.weixin.qq.com/api/doc#90001/90143/91116 - """ - - token = settings.SOCIAL_AUTH_WEIXIN_WORK_TOKEN - EncodingAESKey = settings.SOCIAL_AUTH_WEIXIN_WORK_AES_KEY - - msg_signature = request.GET.get('msg_signature', None) - timestamp = request.GET.get('timestamp', None) - nonce = request.GET.get('nonce', None) - if not (msg_signature and timestamp and nonce): - assert False, 'Request Error' - - if request.method == 'GET': - wxcpt = WXBizMsgCrypt(token, EncodingAESKey, - settings.SOCIAL_AUTH_WEIXIN_WORK_KEY) - - echostr = request.GET.get('echostr', '') - ret, decoded_echostr = wxcpt.VerifyURL(msg_signature, timestamp, nonce, echostr) - if ret != 0: - assert False, 'Verify Error' - - return HttpResponse(decoded_echostr) - - elif request.method == 'POST': - wxcpt = WXBizMsgCrypt(token, EncodingAESKey, - settings.SOCIAL_AUTH_WEIXIN_WORK_SUITID) - - ret, xml_msg = wxcpt.DecryptMsg(request.body, msg_signature, timestamp, nonce) - if ret != 0: - assert False, 'Decrypt Error' - - import xml.etree.cElementTree as ET - xml_tree = ET.fromstring(xml_msg) - suite_ticket = xml_tree.find("SuiteTicket").text - logger.info('suite ticket: %s' % suite_ticket) - - # TODO: use persistent store - cache.set('wx_work_suite_ticket', suite_ticket, 3600) - - return HttpResponse('success') - -def _get_suite_access_token(): - suite_access_token = cache.get('wx_work_suite_access_token', None) - if suite_access_token: - return suite_access_token - - suite_ticket = cache.get('wx_work_suite_ticket', None) - if not suite_ticket: - assert False, 'suite ticket is None!' - - get_suite_token_url = 'https://qyapi.weixin.qq.com/cgi-bin/service/get_suite_token' - resp = requests.request( - 'POST', get_suite_token_url, - json={ - "suite_id": settings.SOCIAL_AUTH_WEIXIN_WORK_SUITID, - "suite_secret": settings.SOCIAL_AUTH_WEIXIN_WORK_SUIT_SECRET, - "suite_ticket": suite_ticket, - }, - headers={'Content-Type': 'application/json', - 'Accept': 'application/json'}, - ) - - suite_access_token = resp.json().get('suite_access_token', None) - if not suite_access_token: - logger.error('Failed to get suite_access_token!') - logger.error(resp.content) - assert False, 'suite_access_token is None!' - else: - cache.set('wx_work_suite_access_token', suite_access_token, 3600) - return suite_access_token - -def weixin_work_3rd_app_install(request): - """Redirect user to weixin work 3rd app install page. - """ - # 0. get suite access token - suite_access_token = _get_suite_access_token() - print('suite access token', suite_access_token) - - # 1. get pre_auth_code - get_pre_auth_code_url = 'https://qyapi.weixin.qq.com/cgi-bin/service/get_pre_auth_code?suite_access_token=' + suite_access_token - resp = requests.request('GET', get_pre_auth_code_url) - - pre_auth_code = resp.json().get('pre_auth_code', None) - if not pre_auth_code: - logger.error('Failed to get pre_auth_code') - logger.error(resp.content) - assert False, 'pre_auth_code is None' - - # 2. set session info - # ref: https://work.weixin.qq.com/api/doc#90001/90143/90602 - url = 'https://qyapi.weixin.qq.com/cgi-bin/service/set_session_info?suite_access_token=' + suite_access_token - resp = requests.request( - 'POST', url, - json={ - "pre_auth_code": pre_auth_code, - "session_info": - { - "appid": [], - "auth_type": 1 # TODO: 0: production; 1: testing. - } - }, - headers={'Content-Type': 'application/json', - 'Accept': 'application/json'}, - - ) - - # TODO: use random state - url = 'https://open.work.weixin.qq.com/3rdapp/install?suite_id=%s&pre_auth_code=%s&redirect_uri=%s&state=STATE123' % ( - settings.SOCIAL_AUTH_WEIXIN_WORK_SUITID, - pre_auth_code, - abs_reverse('weixin_work_3rd_app_install_cb'), - ) - return HttpResponseRedirect(url) - -@csrf_exempt -def weixin_work_3rd_app_install_cb(request): - """Callback for weixin work 3rd app install API. - - https://work.weixin.qq.com/api/doc#90001/90143/90597 - """ - # TODO: check state - pass diff --git a/seahub/tags/migrations/0001_initial.py b/seahub/tags/migrations/0001_initial.py index b3df20d57b..e171d70391 100644 --- a/seahub/tags/migrations/0001_initial.py +++ b/seahub/tags/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:44 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/seahub/tags/models.py b/seahub/tags/models.py index 0dbc1a7781..be80f45717 100644 --- a/seahub/tags/models.py +++ b/seahub/tags/models.py @@ -10,7 +10,7 @@ from django.db import models from seaserv import seafile_api from seahub.base.fields import LowerCaseCharField -from seahub.utils import normalize_file_path,normalize_dir_path +from seahub.utils import normalize_file_path, normalize_dir_path ########## Manager diff --git a/seahub/test_utils.py b/seahub/test_utils.py index 04e9b9c2c8..21aca49b77 100644 --- a/seahub/test_utils.py +++ b/seahub/test_utils.py @@ -175,7 +175,7 @@ class Fixtures(Exam): fd, tmp_file = mkstemp() try: - bytesWritten = os.write(fd, content) + bytesWritten = os.write(fd, content.encode('utf-8')) except: bytesWritten = -1 finally: @@ -204,7 +204,7 @@ class Fixtures(Exam): def create_org_group(self, **kwargs): group_name = kwargs['group_name'] username = kwargs['username'] - org_group_id = ccnet_threaded_rpc.create_org_group(self.org.org_id ,group_name, username) + org_group_id = ccnet_threaded_rpc.create_org_group(self.org.org_id, group_name, username) org_groups = ccnet_threaded_rpc.get_org_groups(self.org.org_id, -1, -1) res_group = None for group in org_groups: @@ -356,7 +356,7 @@ class BaseTestCase(TestCase, Fixtures): self.remove_repo(self.enc_repo.id) def login_as(self, user, password=None): - if isinstance(user, basestring): + if isinstance(user, str): login = user elif isinstance(user, User): login = user.username diff --git a/seahub/thumbnail/urls.py b/seahub/thumbnail/urls.py index 980be33ced..f6353e3d51 100644 --- a/seahub/thumbnail/urls.py +++ b/seahub/thumbnail/urls.py @@ -1,7 +1,7 @@ # Copyright (c) 2012-2016 Seafile Ltd. from django.conf.urls import url, include -from views import thumbnail_create, thumbnail_get, share_link_thumbnail_get, \ +from .views import thumbnail_create, thumbnail_get, share_link_thumbnail_get, \ share_link_thumbnail_create urlpatterns = [ diff --git a/seahub/thumbnail/utils.py b/seahub/thumbnail/utils.py index 9bc2f183ba..85afe631fc 100644 --- a/seahub/thumbnail/utils.py +++ b/seahub/thumbnail/utils.py @@ -3,12 +3,12 @@ import os import posixpath import timeit import tempfile -import urllib2 +import urllib.request, urllib.error, urllib.parse import logging -from StringIO import StringIO +from io import BytesIO import zipfile try: # Py2 and Py3 compatibility - from urllib import urlretrieve + from urllib.request import urlretrieve except: from urllib.request import urlretrieve @@ -142,8 +142,8 @@ def generate_thumbnail(request, repo_id, size, path): inner_path = gen_inner_file_get_url(token, os.path.basename(path)) try: - image_file = urllib2.urlopen(inner_path) - f = StringIO(image_file.read()) + image_file = urllib.request.urlopen(inner_path) + f = BytesIO(image_file.read()) return _create_thumbnail_common(f, thumbnail_file, size) except Exception as e: logger.error(e) @@ -245,11 +245,11 @@ def extract_xmind_image(repo_id, path, size=XMIND_IMAGE_SIZE): inner_path = gen_inner_file_get_url(fileserver_token, file_name) # extract xmind image - xmind_file = urllib2.urlopen(inner_path) - xmind_file_str = StringIO(xmind_file.read()) + xmind_file = urllib.request.urlopen(inner_path) + xmind_file_str = BytesIO(xmind_file.read()) xmind_zip_file = zipfile.ZipFile(xmind_file_str, 'r') extracted_xmind_image = xmind_zip_file.read('Thumbnails/thumbnail.png') - extracted_xmind_image_str = StringIO(extracted_xmind_image) + extracted_xmind_image_str = BytesIO(extracted_xmind_image) # save origin xmind image to thumbnail folder thumbnail_dir = os.path.join(THUMBNAIL_ROOT, str(size)) diff --git a/seahub/thumbnail/views.py b/seahub/thumbnail/views.py index cb056cba45..39c368c67a 100644 --- a/seahub/thumbnail/views.py +++ b/seahub/thumbnail/views.py @@ -36,19 +36,19 @@ def thumbnail_create(request, repo_id): repo = get_repo(repo_id) if not repo: - err_msg = _(u"Library does not exist.") + err_msg = _("Library does not exist.") return HttpResponse(json.dumps({"error": err_msg}), status=400, content_type=content_type) path = request.GET.get('path', None) if not path: - err_msg = _(u"Invalid arguments.") + err_msg = _("Invalid arguments.") return HttpResponse(json.dumps({"error": err_msg}), status=400, content_type=content_type) if repo.encrypted or not ENABLE_THUMBNAIL or \ check_folder_permission(request, repo_id, path) is None: - err_msg = _(u"Permission denied.") + err_msg = _("Permission denied.") return HttpResponse(json.dumps({"error": err_msg}), status=403, content_type=content_type) @@ -151,25 +151,25 @@ def share_link_thumbnail_create(request, token): fileshare = FileShare.objects.get_valid_file_link_by_token(token) if not fileshare: - err_msg = _(u"Invalid token.") + err_msg = _("Invalid token.") return HttpResponse(json.dumps({"error": err_msg}), status=400, content_type=content_type) repo_id = fileshare.repo_id repo = get_repo(repo_id) if not repo: - err_msg = _(u"Library does not exist.") + err_msg = _("Library does not exist.") return HttpResponse(json.dumps({"error": err_msg}), status=400, content_type=content_type) if repo.encrypted or not ENABLE_THUMBNAIL: - err_msg = _(u"Permission denied.") + err_msg = _("Permission denied.") return HttpResponse(json.dumps({"error": err_msg}), status=403, content_type=content_type) req_path = request.GET.get('path', None) if not req_path or '../' in req_path: - err_msg = _(u"Invalid arguments.") + err_msg = _("Invalid arguments.") return HttpResponse(json.dumps({"error": err_msg}), status=400, content_type=content_type) diff --git a/seahub/trusted_ip/migrations/0001_initial.py b/seahub/trusted_ip/migrations/0001_initial.py index f034e0aa37..fb5b7e1fa5 100644 --- a/seahub/trusted_ip/migrations/0001_initial.py +++ b/seahub/trusted_ip/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:45 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/trusted_ip/models.py b/seahub/trusted_ip/models.py index 420b2c7b24..3e3638a787 100644 --- a/seahub/trusted_ip/models.py +++ b/seahub/trusted_ip/models.py @@ -4,6 +4,7 @@ import operator from django.conf import settings from django.db import models from django.db.models import Q +from functools import reduce class TrustedIPManager(models.Manager): diff --git a/seahub/two_factor/decorators.py b/seahub/two_factor/decorators.py index 810ef6ad0c..7a8dd2830a 100644 --- a/seahub/two_factor/decorators.py +++ b/seahub/two_factor/decorators.py @@ -1,5 +1,5 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from __future__ import absolute_import, division, print_function, unicode_literals + from seahub.auth.decorators import user_passes_test diff --git a/seahub/two_factor/gateways/twilio/gateway.py b/seahub/two_factor/gateways/twilio/gateway.py index de13981752..dd9f47efcf 100644 --- a/seahub/two_factor/gateways/twilio/gateway.py +++ b/seahub/two_factor/gateways/twilio/gateway.py @@ -1,10 +1,10 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from __future__ import absolute_import + try: from urllib.parse import urlencode except ImportError: - from urllib import urlencode + from urllib.parse import urlencode from django.conf import settings from django.core.urlresolvers import reverse diff --git a/seahub/two_factor/gateways/twilio/views.py b/seahub/two_factor/gateways/twilio/views.py index 1041ad126b..18bbe7ffa5 100644 --- a/seahub/two_factor/gateways/twilio/views.py +++ b/seahub/two_factor/gateways/twilio/views.py @@ -57,7 +57,7 @@ class TwilioCallApp(View): def create_response(self, template): with translation.override(self.get_locale()): prompt_context = self.get_prompt_context() - template_context = dict((k, v % prompt_context) for k, v in self.prompts.items()) + template_context = dict((k, v % prompt_context) for k, v in list(self.prompts.items())) template_context['locale'] = self.get_twilio_locale() return HttpResponse(template % template_context, 'text/xml') diff --git a/seahub/two_factor/middleware.py b/seahub/two_factor/middleware.py index 6543e9ac9a..e358a54151 100644 --- a/seahub/two_factor/middleware.py +++ b/seahub/two_factor/middleware.py @@ -1,5 +1,5 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from __future__ import absolute_import, division, print_function, unicode_literals + import re from constance import config diff --git a/seahub/two_factor/migrations/0001_initial.py b/seahub/two_factor/migrations/0001_initial.py index 89fa096704..6af3b8280f 100644 --- a/seahub/two_factor/migrations/0001_initial.py +++ b/seahub/two_factor/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:44 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/seahub/two_factor/models/base.py b/seahub/two_factor/models/base.py index 922dd82a8c..ea52862852 100644 --- a/seahub/two_factor/models/base.py +++ b/seahub/two_factor/models/base.py @@ -1,5 +1,5 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from __future__ import absolute_import, division, print_function, unicode_literals + from binascii import unhexlify import logging diff --git a/seahub/two_factor/models/phone.py b/seahub/two_factor/models/phone.py index 754cccd65a..e8b7bcf9fb 100644 --- a/seahub/two_factor/models/phone.py +++ b/seahub/two_factor/models/phone.py @@ -1,5 +1,5 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from __future__ import absolute_import, division, print_function, unicode_literals + from binascii import unhexlify import logging diff --git a/seahub/two_factor/models/static.py b/seahub/two_factor/models/static.py index 71c3f649d7..a6f468fbb1 100644 --- a/seahub/two_factor/models/static.py +++ b/seahub/two_factor/models/static.py @@ -1,5 +1,5 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from __future__ import absolute_import, division, print_function, unicode_literals + from base64 import b32encode from os import urandom diff --git a/seahub/two_factor/models/totp.py b/seahub/two_factor/models/totp.py index be248db0a2..49c6a19324 100644 --- a/seahub/two_factor/models/totp.py +++ b/seahub/two_factor/models/totp.py @@ -1,5 +1,5 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from __future__ import absolute_import, division, print_function, unicode_literals + from binascii import unhexlify import time diff --git a/seahub/two_factor/oath.py b/seahub/two_factor/oath.py index 09bf25e7de..582dff2dac 100644 --- a/seahub/two_factor/oath.py +++ b/seahub/two_factor/oath.py @@ -1,5 +1,5 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from __future__ import absolute_import, division, print_function, unicode_literals + from hashlib import sha1 import hmac diff --git a/seahub/two_factor/utils.py b/seahub/two_factor/utils.py index 230986ae77..82f247df99 100644 --- a/seahub/two_factor/utils.py +++ b/seahub/two_factor/utils.py @@ -1,5 +1,5 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from __future__ import absolute_import, division, print_function, unicode_literals + import sys from binascii import hexlify, unhexlify @@ -8,7 +8,7 @@ from os import urandom try: from urllib.parse import quote, urlencode except ImportError: - from urllib import quote, urlencode + from urllib.parse import quote, urlencode from django.conf import settings from django.core.exceptions import ValidationError diff --git a/seahub/two_factor/views/core.py b/seahub/two_factor/views/core.py index 6a488eca0f..ea8a7cbb92 100644 --- a/seahub/two_factor/views/core.py +++ b/seahub/two_factor/views/core.py @@ -105,7 +105,7 @@ class SetupView(CheckTwoFactorEnabledMixin, IdempotentSessionWizardView): """ In the validation step, ask the device to generate a challenge. """ - next_step = self.steps.next + next_step = self.steps.__next__ if next_step == 'validation': try: self.get_device().generate_challenge() diff --git a/seahub/two_factor/views/mixins.py b/seahub/two_factor/views/mixins.py index 6c80390e69..9f3bfd322f 100644 --- a/seahub/two_factor/views/mixins.py +++ b/seahub/two_factor/views/mixins.py @@ -2,7 +2,7 @@ try: from urllib.parse import urlencode except ImportError: - from urllib import urlencode + from urllib.parse import urlencode from django.core.urlresolvers import reverse from django.template.response import TemplateResponse diff --git a/seahub/urls.py b/seahub/urls.py index 7a22f0c89c..85470677bd 100644 --- a/seahub/urls.py +++ b/seahub/urls.py @@ -16,7 +16,7 @@ from seahub.views.file import view_history_file, view_trash_file,\ view_media_file_via_public_wiki from seahub.views.repo import repo_history_view, repo_snapshot, view_shared_dir, \ view_shared_upload_link, view_lib_as_wiki -from notifications.views import notification_list +from .notifications.views import notification_list from seahub.views.wiki import personal_wiki, personal_wiki_pages, \ personal_wiki_create, personal_wiki_page_new, personal_wiki_page_edit, \ personal_wiki_page_delete, personal_wiki_use_lib @@ -158,7 +158,6 @@ urlpatterns = [ url(r'^sso/$', sso, name='sso'), url(r'^shib-login/', shib_login, name="shib_login"), url(r'^oauth/', include('seahub.oauth.urls')), - url(r'^social/', include('social_django.urls', namespace='social')), url(r'^$', libraries, name='libraries'), #url(r'^home/$', direct_to_template, { 'template': 'home.html' } ), @@ -695,12 +694,6 @@ if HAS_FILE_SEARCH: url(r'^pubinfo/users/search/$', pubuser_search, name='pubuser_search'), ] -if getattr(settings, 'ENABLE_PAYMENT', False): - urlpatterns += [ - url(r'^pay/', include('seahub_extra.pay.urls')), - ] - - if getattr(settings, 'ENABLE_SYSADMIN_EXTRA', False): from seahub_extra.sysadmin_extra.views import sys_login_admin, \ sys_log_file_audit, sys_log_file_update, sys_log_perm_audit, \ @@ -795,14 +788,3 @@ if getattr(settings, 'ENABLE_CAS', False): url(r'^accounts/cas-logout/$', cas_logout, name='cas_ng_logout'), url(r'^accounts/cas-callback/$', cas_callback, name='cas_ng_proxy_callback'), ] - -from seahub.social_core.views import ( - weixin_work_cb, weixin_work_3rd_app_install, weixin_work_3rd_app_install_cb -) - -urlpatterns += [ - url(r'^weixin-work/callback/$', weixin_work_cb), - url(r'^weixin-work/3rd-app-install/$', weixin_work_3rd_app_install), - url(r'^weixin-work/3rd-app-install/callback/$', - weixin_work_3rd_app_install_cb, name='weixin_work_3rd_app_install_cb'), -] diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py index 9af4f54c14..a061115050 100644 --- a/seahub/utils/__init__.py +++ b/seahub/utils/__init__.py @@ -3,18 +3,18 @@ from functools import partial import os import re -import urllib -import urllib2 +import urllib.request, urllib.parse, urllib.error +import urllib.request, urllib.error, urllib.parse import uuid import logging import hashlib import tempfile import locale -import ConfigParser +import configparser import mimetypes import contextlib from datetime import datetime -from urlparse import urlparse, urljoin +from urllib.parse import urlparse, urljoin import json import ccnet @@ -59,6 +59,8 @@ try: except ImportError: CHECK_SHARE_LINK_TRAFFIC = False +logger = logging.getLogger(__name__) + # init Seafevents API if EVENTS_CONFIG_FILE: try: @@ -88,7 +90,7 @@ def is_pro_version(): return False def is_cluster_mode(): - cfg = ConfigParser.ConfigParser() + cfg = configparser.ConfigParser() if 'SEAFILE_CENTRAL_CONF_DIR' in os.environ: confdir = os.environ['SEAFILE_CENTRAL_CONF_DIR'] else: @@ -145,7 +147,7 @@ def gen_fileext_type_map(): """ d = {} - for filetype in PREVIEW_FILEEXT.keys(): + for filetype in list(PREVIEW_FILEEXT.keys()): for fileext in PREVIEW_FILEEXT.get(filetype): d[fileext] = filetype @@ -333,7 +335,7 @@ def check_filename_with_rename(repo_id, parent_dir, obj_name): return '' # TODO: what if parrent_dir does not exist? dirents = seafile_api.list_dir_by_commit_and_path(repo_id, - latest_commit.id, parent_dir.encode('utf-8')) + latest_commit.id, parent_dir) exist_obj_names = [dirent.obj_name for dirent in dirents] return get_no_duplicate_obj_name(obj_name, exist_obj_names) @@ -351,7 +353,7 @@ def get_user_repos(username, org_id=None): if CLOUD_MODE: public_repos = [] else: - public_repos = seaserv.list_inner_pub_repos(username) + public_repos = seafile_api.get_inner_pub_repo_list() for r in shared_repos + public_repos: # collumn names in shared_repo struct are not same as owned or group @@ -554,7 +556,7 @@ def is_org_context(request): # events related if EVENTS_CONFIG_FILE: - parsed_events_conf = ConfigParser.ConfigParser() + parsed_events_conf = configparser.ConfigParser() parsed_events_conf.read(EVENTS_CONFIG_FILE) try: @@ -650,7 +652,7 @@ if EVENTS_CONFIG_FILE: valid_events = [] next_start = start while True: - if org_id > 0: + if org_id and org_id > 0: events = seafevents.get_org_user_events(ev_session, org_id, username, next_start, limit) @@ -733,14 +735,14 @@ if EVENTS_CONFIG_FILE: event_type_dict = { 'file-download-web': ('web', ''), - 'file-download-share-link': ('share-link',''), + 'file-download-share-link': ('share-link', ''), 'file-download-api': ('API', e.device), 'repo-download-sync': ('download-sync', e.device), 'repo-upload-sync': ('upload-sync', e.device), 'seadrive-download-file': ('seadrive-download', e.device), } - if not event_type_dict.has_key(e.etype): + if e.etype not in event_type_dict: event_type_dict[e.etype] = (e.etype, e.device if e.device else '') return event_type_dict[e.etype] @@ -891,10 +893,10 @@ else: def calc_file_path_hash(path, bits=12): - if isinstance(path, unicode): + if isinstance(path, str): path = path.encode('UTF-8') - path_hash = hashlib.md5(urllib2.quote(path)).hexdigest()[:bits] + path_hash = hashlib.md5(urllib.parse.quote(path)).hexdigest()[:bits] return path_hash @@ -1019,12 +1021,8 @@ def mkstemp(): ''' fd, path = tempfile.mkstemp() - system_encoding = locale.getdefaultlocale()[1] - if system_encoding is not None: - path_utf8 = path.decode(system_encoding).encode('UTF-8') - return fd, path_utf8 - else: - return fd, path + + return fd, path # File or directory operations FILE_OP = ('Added or modified', 'Added', 'Modified', 'Renamed', 'Moved', @@ -1168,7 +1166,7 @@ if HAS_OFFICE_CONVERTER: def delegate_add_office_convert_task(file_id, doctype, raw_path): url = urljoin(OFFICE_CONVERTOR_ROOT, '/office-convert/internal/add-task/') - data = urllib.urlencode({ + data = urllib.parse.urlencode({ 'file_id': file_id, 'doctype': doctype, 'raw_path': raw_path, @@ -1200,7 +1198,7 @@ if HAS_OFFICE_CONVERTER: try: ret = do_urlopen(url, headers=headers) data = ret.read() - except urllib2.HTTPError, e: + except urllib.error.HTTPError as e: if timestamp and e.code == 304: return HttpResponseNotModified() else: @@ -1255,7 +1253,7 @@ if HAS_OFFICE_CONVERTER: add_office_convert_task(obj_id, doctype, raw_path) except: logging.exception('failed to add_office_convert_task:') - return _(u'Internal error') + return _('Internal error') return None # search realted @@ -1350,14 +1348,14 @@ def calculate_bitwise(num): return level def do_md5(s): - if isinstance(s, unicode): + if isinstance(s, str): s = s.encode('UTF-8') return hashlib.md5(s).hexdigest() def do_urlopen(url, data=None, headers=None): headers = headers or {} - req = urllib2.Request(url, data=data, headers=headers) - ret = urllib2.urlopen(req) + req = urllib.request.Request(url, data=data, headers=headers) + ret = urllib.request.urlopen(req) return ret def clear_token(username): @@ -1382,10 +1380,9 @@ def send_perm_audit_msg(etype, from_user, to, repo_id, path, perm): """ msg = 'perm-change\t%s\t%s\t%s\t%s\t%s\t%s' % \ (etype, from_user, to, repo_id, path, perm) - msg_utf8 = msg.encode('utf-8') try: - seaserv.send_message('seahub.audit', msg_utf8) + seafile_api.publish_event('seahub.audit', msg) except Exception as e: logger.error("Error when sending perm-audit-%s message: %s" % (etype, str(e))) @@ -1418,7 +1415,7 @@ def get_system_admins(): return admins def is_windows_operating_system(request): - if not request.META.has_key('HTTP_USER_AGENT'): + if 'HTTP_USER_AGENT' not in request.META: return False if 'windows' in request.META['HTTP_USER_AGENT'].lower(): @@ -1432,7 +1429,7 @@ def get_folder_permission_recursively(username, repo_id, path): Ger permission from the innermost layer of subdirectories to root directory. """ - if not path or not isinstance(path, basestring): + if not path or not isinstance(path, str): raise Exception('path invalid.') if not seafile_api.get_dir_id_by_path(repo_id, path): diff --git a/seahub/utils/error_msg.py b/seahub/utils/error_msg.py index 6d993184af..675fa2ba1c 100644 --- a/seahub/utils/error_msg.py +++ b/seahub/utils/error_msg.py @@ -5,11 +5,11 @@ from django.template.defaultfilters import filesizeformat def file_type_error_msg(ext, allowed_file_exts): if isinstance(allowed_file_exts, tuple) or isinstance(allowed_file_exts, list): allowed_file_exts = ", ".join(allowed_file_exts) - return _(u"%(ext)s is an invalid file extension. Authorized extensions are " + + return _("%(ext)s is an invalid file extension. Authorized extensions are " + ": %(valid_exts_list)s") % {'ext' : ext, 'valid_exts_list' : allowed_file_exts} def file_size_error_msg(size, max_size): - return _(u"Your file is too big (%(size)s), the maximum allowed size is " + + return _("Your file is too big (%(size)s), the maximum allowed size is " + "%(max_valid_size)s") % { 'size' : filesizeformat(size), 'max_valid_size' : filesizeformat(max_size)} diff --git a/seahub/utils/file_op.py b/seahub/utils/file_op.py index b1ff3cd92b..1325597e85 100644 --- a/seahub/utils/file_op.py +++ b/seahub/utils/file_op.py @@ -33,7 +33,7 @@ def check_file_lock(repo_id, file_path, username): if return_value == 0: return (False, False) elif return_value == 1: - return (True , False) + return (True, False) elif return_value == 2: return (True, True) else: diff --git a/seahub/utils/file_size.py b/seahub/utils/file_size.py index ae4ade97e6..2c73125468 100644 --- a/seahub/utils/file_size.py +++ b/seahub/utils/file_size.py @@ -35,7 +35,7 @@ def get_file_size_unit(unit_type): } unit_type = unit_type.lower() - if unit_type not in table.keys(): + if unit_type not in list(table.keys()): raise TypeError('Invalid unit type') return table.get(unit_type) diff --git a/seahub/utils/hasher.py b/seahub/utils/hasher.py index 6756ecf6e6..f9f7e9cb04 100644 --- a/seahub/utils/hasher.py +++ b/seahub/utils/hasher.py @@ -26,8 +26,8 @@ pad = lambda s: s + (16 - len(s) % 16) * PADDING # one-liners to encrypt/encode and decrypt/decode a string # encrypt with AES, encode with base64 -EncodeAES = lambda c, s: base64.b64encode(c.encrypt(pad(s))) -DecodeAES = lambda c, e: c.decrypt(base64.b64decode(e)).rstrip(PADDING) +EncodeAES = lambda c, s: base64.b64encode(c.encrypt(pad(s).encode('utf-8'))).decode('utf-8') +DecodeAES = lambda c, e: c.decrypt(base64.b64decode(e)).decode('utf-8').rstrip(PADDING) class AESPasswordHasher: algorithm = 'aes' @@ -36,7 +36,7 @@ class AESPasswordHasher: if not secret: secret = settings.SECRET_KEY[:BLOCK_SIZE] - self.cipher = AES.new(secret, AES.MODE_ECB) + self.cipher = AES.new(secret.encode('utf-8'), AES.MODE_ECB) def encode(self, password): password = force_str(password) @@ -49,5 +49,6 @@ class AESPasswordHasher: algorithm, data = encoded.split('$', 1) if algorithm != self.algorithm: raise AESPasswordDecodeError + data = data.encode('utf-8') return DecodeAES(self.cipher, data) diff --git a/seahub/utils/html.py b/seahub/utils/html.py index 50ad9301f4..6f23fb0986 100644 --- a/seahub/utils/html.py +++ b/seahub/utils/html.py @@ -1,5 +1,5 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from __future__ import unicode_literals + def avoid_wrapping(value): """ diff --git a/seahub/utils/htmldiff.py b/seahub/utils/htmldiff.py index 011a11e813..e78e7e5493 100644 --- a/seahub/utils/htmldiff.py +++ b/seahub/utils/htmldiff.py @@ -404,7 +404,7 @@ class SequenceMatcher: # junk-free match ending with a[i-1] and b[j] j2len = {} nothing = [] - for i in xrange(alo, ahi): + for i in range(alo, ahi): # look at all instances of a[i] in b; note that because # b2j has no junk keys, the loop is skipped if a[i] is junk j2lenget = j2len.get @@ -520,7 +520,7 @@ class SequenceMatcher: non_adjacent.append( (la, lb, 0) ) self.matching_blocks = non_adjacent - return map(Match._make, self.matching_blocks) + return list(map(Match._make, self.matching_blocks)) def get_opcodes(self): """Return list of 5-tuples describing how to turn a into b. @@ -623,7 +623,7 @@ class SequenceMatcher: yield group group = [] i1, j1 = max(i1, i2-n), max(j1, j2-n) - group.append((tag, i1, i2, j1 ,j2)) + group.append((tag, i1, i2, j1, j2)) if group and not (len(group)==1 and group[0][0] == 'equal'): yield group @@ -911,14 +911,14 @@ class Differ: elif tag == 'equal': g = self._dump(' ', a, alo, ahi) else: - raise ValueError, 'unknown tag %r' % (tag,) + raise ValueError('unknown tag %r' % (tag,)) for line in g: yield line def _dump(self, tag, x, lo, hi): """Generate comparison results for a same-tagged range.""" - for i in xrange(lo, hi): + for i in range(lo, hi): yield '%s %s' % (tag, x[i]) def _plain_replace(self, a, alo, ahi, b, blo, bhi): @@ -964,10 +964,10 @@ class Differ: # search for the pair that matches best without being identical # (identical lines must be junk lines, & we don't want to synch up # on junk -- unless we have to) - for j in xrange(blo, bhi): + for j in range(blo, bhi): bj = b[j] cruncher.set_seq2(bj) - for i in xrange(alo, ahi): + for i in range(alo, ahi): ai = a[i] if ai == bj: if eqi is None: @@ -1023,7 +1023,7 @@ class Differ: atags += ' ' * la btags += ' ' * lb else: - raise ValueError, 'unknown tag %r' % (tag,) + raise ValueError('unknown tag %r' % (tag,)) for line in self._qformat(aelt, belt, atags, btags): yield line else: @@ -1191,7 +1191,7 @@ def unified_diff(a, b, fromfile='', tofile='', fromfiledate='', """ started = False - for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n): + for group in SequenceMatcher(None, a, b).get_grouped_opcodes(n): if not started: started = True fromdate = '\t{}'.format(fromfiledate) if fromfiledate else '' @@ -1278,7 +1278,7 @@ def context_diff(a, b, fromfile='', tofile='', prefix = dict(insert='+ ', delete='- ', replace='! ', equal=' ') started = False - for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n): + for group in SequenceMatcher(None, a, b).get_grouped_opcodes(n): if not started: started = True fromdate = '\t{}'.format(fromfiledate) if fromfiledate else '' @@ -1383,9 +1383,9 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, change_re = re.compile('(\++|\-+|\^+)') # create the difference iterator to generate the differences - diff_lines_iterator = ndiff(fromlines,tolines,linejunk,charjunk) + diff_lines_iterator = ndiff(fromlines, tolines, linejunk, charjunk) - def _make_line(lines, format_key, side, num_lines=[0,0]): + def _make_line(lines, format_key, side, num_lines=[0, 0]): """Returns line of text with user's change markup and line formatting. lines -- list of lines from the ndiff generator to produce a line of @@ -1412,19 +1412,19 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, # Handle case where no user markup is to be added, just return line of # text with user's line format to allow for usage of the line number. if format_key is None: - return (num_lines[side],lines.pop(0)[2:]) + return (num_lines[side], lines.pop(0)[2:]) # Handle case of intraline changes if format_key == '?': text, markers = lines.pop(0), lines.pop(0) # find intraline changes (store change type and indices in tuples) sub_info = [] def record_sub_info(match_object,sub_info=sub_info): - sub_info.append([match_object.group(1)[0],match_object.span()]) + sub_info.append([match_object.group(1)[0], match_object.span()]) return match_object.group(1) - change_re.sub(record_sub_info,markers) + change_re.sub(record_sub_info, markers) # process each tuple inserting our special marks that won't be # noticed by an xml/html escaper. - for key,(begin,end) in sub_info[::-1]: + for key, (begin, end) in sub_info[::-1]: text = text[0:begin]+'\0'+key+text[begin:end]+'\1'+text[end:] text = text[2:] # Handle case of add/delete entire line @@ -1439,7 +1439,7 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, # Return line of text, first allow user's line formatter to do its # thing (such as adding the line number) then replace the special # marks with what the user's change markup. - return (num_lines[side],text) + return (num_lines[side], text) def _line_iterator(): """Yields from/to lines of text with a change indication. @@ -1463,7 +1463,7 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, # so we can do some very readable comparisons. while len(lines) < 4: try: - lines.append(diff_lines_iterator.next()) + lines.append(next(diff_lines_iterator)) except StopIteration: lines.append('X') s = ''.join([line[0] for line in lines]) @@ -1474,63 +1474,63 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, num_blanks_to_yield = num_blanks_pending elif s.startswith('-?+?'): # simple intraline change - yield _make_line(lines,'?',0), _make_line(lines,'?',1), True + yield _make_line(lines, '?', 0), _make_line(lines, '?', 1), True continue elif s.startswith('--++'): # in delete block, add block coming: we do NOT want to get # caught up on blank lines yet, just process the delete line num_blanks_pending -= 1 - yield _make_line(lines,'-',0), None, True + yield _make_line(lines, '-', 0), None, True continue elif s.startswith(('--?+', '--+', '- ')): # in delete block and see a intraline change or unchanged line # coming: yield the delete line and then blanks - from_line,to_line = _make_line(lines,'-',0), None - num_blanks_to_yield,num_blanks_pending = num_blanks_pending-1,0 + from_line, to_line = _make_line(lines, '-', 0), None + num_blanks_to_yield, num_blanks_pending = num_blanks_pending-1, 0 elif s.startswith('-+?'): # intraline change - yield _make_line(lines,None,0), _make_line(lines,'?',1), True + yield _make_line(lines, None, 0), _make_line(lines, '?', 1), True continue elif s.startswith('-?+'): # intraline change - yield _make_line(lines,'?',0), _make_line(lines,None,1), True + yield _make_line(lines, '?', 0), _make_line(lines, None, 1), True continue elif s.startswith('-'): # delete FROM line num_blanks_pending -= 1 - yield _make_line(lines,'-',0), None, True + yield _make_line(lines, '-', 0), None, True continue elif s.startswith('+--'): # in add block, delete block coming: we do NOT want to get # caught up on blank lines yet, just process the add line num_blanks_pending += 1 - yield None, _make_line(lines,'+',1), True + yield None, _make_line(lines, '+', 1), True continue elif s.startswith(('+ ', '+-')): # will be leaving an add block: yield blanks then add line - from_line, to_line = None, _make_line(lines,'+',1) - num_blanks_to_yield,num_blanks_pending = num_blanks_pending+1,0 + from_line, to_line = None, _make_line(lines, '+', 1) + num_blanks_to_yield, num_blanks_pending = num_blanks_pending+1, 0 elif s.startswith('+'): # inside an add block, yield the add line num_blanks_pending += 1 - yield None, _make_line(lines,'+',1), True + yield None, _make_line(lines, '+', 1), True continue elif s.startswith(' '): # unchanged text, yield it to both sides - yield _make_line(lines[:],None,0),_make_line(lines,None,1),False + yield _make_line(lines[:], None, 0), _make_line(lines, None, 1), False continue # Catch up on the blank lines so when we yield the next from/to # pair, they are lined up. while(num_blanks_to_yield < 0): num_blanks_to_yield += 1 - yield None,('','\n'),True + yield None, ('', '\n'), True while(num_blanks_to_yield > 0): num_blanks_to_yield -= 1 - yield ('','\n'),None,True + yield ('', '\n'), None, True if s.startswith('X'): raise StopIteration else: - yield from_line,to_line,True + yield from_line, to_line, True def _line_pair_iterator(): """Yields from/to lines of text with a change indication. @@ -1546,26 +1546,26 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, is defined) does not need to be of module scope. """ line_iterator = _line_iterator() - fromlines,tolines=[],[] + fromlines, tolines=[], [] while True: # Collecting lines of text until we have a from/to pair while (len(fromlines)==0 or len(tolines)==0): - from_line, to_line, found_diff =line_iterator.next() + from_line, to_line, found_diff =next(line_iterator) if from_line is not None: - fromlines.append((from_line,found_diff)) + fromlines.append((from_line, found_diff)) if to_line is not None: - tolines.append((to_line,found_diff)) + tolines.append((to_line, found_diff)) # Once we have a pair, remove them from the collection and yield it from_line, fromDiff = fromlines.pop(0) to_line, to_diff = tolines.pop(0) - yield (from_line,to_line,fromDiff or to_diff) + yield (from_line, to_line, fromDiff or to_diff) # Handle case where user does not want context differencing, just yield # them up without doing anything else with them. line_pair_iterator = _line_pair_iterator() if context is None: while True: - yield line_pair_iterator.next() + yield next(line_pair_iterator) # Handle case where user wants context differencing. We must do some # storage of lines until we know for sure that they are to be yielded. else: @@ -1578,7 +1578,7 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, index, contextLines = 0, [None]*(context) found_diff = False while(found_diff is False): - from_line, to_line, found_diff = line_pair_iterator.next() + from_line, to_line, found_diff = next(line_pair_iterator) i = index % context contextLines[i] = (from_line, to_line, found_diff) index += 1 @@ -1598,7 +1598,7 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, # Now yield the context lines after the change lines_to_write = context-1 while(lines_to_write): - from_line, to_line, found_diff = line_pair_iterator.next() + from_line, to_line, found_diff = next(line_pair_iterator) # If another change within the context, extend the context if found_diff: lines_to_write = context-1 @@ -1723,10 +1723,10 @@ class HtmlDiff(object): return self._file_template % dict( styles = self._styles, legend = self._legend, - table = self.make_table(fromlines,tolines,fromdesc,todesc, - context=context,numlines=numlines)) + table = self.make_table(fromlines, tolines, fromdesc, todesc, + context=context, numlines=numlines)) - def _tab_newline_replace(self,fromlines,tolines): + def _tab_newline_replace(self, fromlines, tolines): """Returns from/to line lists with tabs expanded and newlines removed. Instead of tab characters being replaced by the number of spaces @@ -1738,18 +1738,18 @@ class HtmlDiff(object): """ def expand_tabs(line): # hide real spaces - line = line.replace(' ','\0') + line = line.replace(' ', '\0') # expand tabs into spaces line = line.expandtabs(self._tabsize) # replace spaces from expanded tabs back into tab characters # (we'll replace them with markup after we do differencing) - line = line.replace(' ','\t') - return line.replace('\0',' ').rstrip('\n') + line = line.replace(' ', '\t') + return line.replace('\0', ' ').rstrip('\n') fromlines = [expand_tabs(line) for line in fromlines] tolines = [expand_tabs(line) for line in tolines] - return fromlines,tolines + return fromlines, tolines - def _split_line(self,data_list,line_num,text): + def _split_line(self, data_list, line_num, text): """Builds list of text lines by splitting text lines at wrap point This function will determine if the input text line needs to be @@ -1760,14 +1760,14 @@ class HtmlDiff(object): """ # if blank line or context separator, just add it to the output list if not line_num: - data_list.append((line_num,text)) + data_list.append((line_num, text)) return # if line text doesn't need wrapping, just add it to the output list size = len(text) max = self._wrapcolumn if (size <= max) or ((size -(text.count('\0')*3)) <= max): - data_list.append((line_num,text)) + data_list.append((line_num, text)) return # scan text looking for the wrap point, keeping track if the wrap @@ -1799,61 +1799,61 @@ class HtmlDiff(object): line2 = '\0' + mark + line2 # tack on first line onto the output list - data_list.append((line_num,line1)) + data_list.append((line_num, line1)) # use this routine again to wrap the remaining text - self._split_line(data_list,'>',line2) + self._split_line(data_list, '>', line2) - def _line_wrapper(self,diffs): + def _line_wrapper(self, diffs): """Returns iterator that splits (wraps) mdiff text lines""" # pull from/to data and flags from mdiff iterator - for fromdata,todata,flag in diffs: + for fromdata, todata, flag in diffs: # check for context separators and pass them through if flag is None: - yield fromdata,todata,flag + yield fromdata, todata, flag continue - (fromline,fromtext),(toline,totext) = fromdata,todata + (fromline, fromtext), (toline, totext) = fromdata, todata # for each from/to line split it at the wrap column to form # list of text lines. - fromlist,tolist = [],[] - self._split_line(fromlist,fromline,fromtext) - self._split_line(tolist,toline,totext) + fromlist, tolist = [], [] + self._split_line(fromlist, fromline, fromtext) + self._split_line(tolist, toline, totext) # yield from/to line in pairs inserting blank lines as # necessary when one side has more wrapped lines while fromlist or tolist: if fromlist: fromdata = fromlist.pop(0) else: - fromdata = ('',' ') + fromdata = ('', ' ') if tolist: todata = tolist.pop(0) else: - todata = ('',' ') - yield fromdata,todata,flag + todata = ('', ' ') + yield fromdata, todata, flag - def _collect_lines(self,diffs): + def _collect_lines(self, diffs): """Collects mdiff output into separate lists Before storing the mdiff from/to data into a list, it is converted into a single line of text with HTML markup. """ - fromlist,tolist,flaglist = [],[],[] + fromlist, tolist, flaglist = [], [], [] # pull from/to data and flags from mdiff style iterator - for fromdata,todata,flag in diffs: + for fromdata, todata, flag in diffs: try: # store HTML markup of the lines into the lists - fromlist.append(self._format_line(0,flag,*fromdata)) - tolist.append(self._format_line(1,flag,*todata)) + fromlist.append(self._format_line(0, flag, *fromdata)) + tolist.append(self._format_line(1, flag, *todata)) except TypeError: # exceptions occur for lines where context separators go fromlist.append(None) tolist.append(None) flaglist.append(flag) - return fromlist,tolist,flaglist + return fromlist, tolist, flaglist - def _format_line(self,side,flag,linenum,text): + def _format_line(self, side, flag, linenum, text): """Returns HTML markup of "from" / "to" text lines side -- 0 or 1 indicating "from" or "to" text @@ -1863,15 +1863,15 @@ class HtmlDiff(object): """ try: linenum = '%d' % linenum - id = ' id="%s%s"' % (self._prefix[side],linenum) + id = ' id="%s%s"' % (self._prefix[side], linenum) except TypeError: # handle blank lines where linenum is '>' or '' id = '' # replace those things that would get confused with HTML symbols - text=text.replace("&","&").replace(">",">").replace("<","<") + text=text.replace("&", "&").replace(">", ">").replace("<", "<") # make space non-breakable so they don't get compressed or line wrapped - text = text.replace(' ',' ').rstrip() + text = text.replace(' ', ' ').rstrip() cls = '' if '\0+' in text: @@ -1883,14 +1883,14 @@ class HtmlDiff(object): text = text.replace('\0+', '').replace('\0-', ''). \ replace('\0^', '').replace('\1', ''). \ - replace('\t',' ') + replace('\t', ' ') if cls: return '%s%s' \ - % (linenum,cls,text) + % (linenum, cls, text) else: return '%s%s' \ - % (linenum,text) + % (linenum, text) def _make_prefix(self): """Create unique anchor prefixes""" @@ -1901,9 +1901,9 @@ class HtmlDiff(object): toprefix = "to%d_" % HtmlDiff._default_prefix HtmlDiff._default_prefix += 1 # store prefixes so line format method has access - self._prefix = [fromprefix,toprefix] + self._prefix = [fromprefix, toprefix] - def _convert_flags(self,fromlist,tolist,flaglist,context,numlines): + def _convert_flags(self, fromlist, tolist, flaglist, context, numlines): """Makes list of "next" links""" # all anchor names will be generated using the unique "to" prefix @@ -1914,7 +1914,7 @@ class HtmlDiff(object): next_href = ['']*len(flaglist) num_chg, in_change = 0, False last = 0 - for i,flag in enumerate(flaglist): + for i, flag in enumerate(flaglist): if flag: if not in_change: in_change = True @@ -1922,13 +1922,13 @@ class HtmlDiff(object): # at the beginning of a change, drop an anchor a few lines # (the context lines) before the change for the previous # link - i = max([0,i-numlines]) - next_id[i] = ' id="difflib_chg_%s_%d"' % (toprefix,num_chg) + i = max([0, i-numlines]) + next_id[i] = ' id="difflib_chg_%s_%d"' % (toprefix, num_chg) # at the beginning of a change, drop a link to the next # change num_chg += 1 next_href[last] = 'n' % ( - toprefix,num_chg) + toprefix, num_chg) else: in_change = False # check for cases where there is no content to avoid exceptions @@ -1948,7 +1948,7 @@ class HtmlDiff(object): # redo the last link to link to the top next_href[last] = 't' % (toprefix) - return fromlist,tolist,flaglist,next_href,next_id + return fromlist, tolist, flaglist, next_href, next_id def make_table(self,fromlines,tolines,context=False, numlines=5): """Returns HTML table of side by side comparison with change highlights @@ -1973,14 +1973,14 @@ class HtmlDiff(object): # change tabs to spaces before it gets more difficult after we insert # markkup - fromlines,tolines = self._tab_newline_replace(fromlines,tolines) + fromlines, tolines = self._tab_newline_replace(fromlines, tolines) # create diffs iterator which generates side by side from/to data if context: context_lines = numlines else: context_lines = None - diffs = _mdiff(fromlines,tolines,context_lines,linejunk=self._linejunk, + diffs = _mdiff(fromlines, tolines, context_lines, linejunk=self._linejunk, charjunk=self._charjunk) # set up iterator to wrap lines that exceed desired width @@ -1988,7 +1988,7 @@ class HtmlDiff(object): diffs = self._line_wrapper(diffs) # collect up from/to lines and flags into lists (also format the lines) - fromlist,tolist,flaglist = self._collect_lines(diffs) + fromlist, tolist, flaglist = self._collect_lines(diffs) # process change flags, generating middle column of next anchors/links # fromlist,tolist,flaglist,next_href,next_id = self._convert_flags( @@ -2043,7 +2043,7 @@ def restore(delta, which): try: tag = {1: "- ", 2: "+ "}[int(which)] except KeyError: - raise ValueError, ('unknown delta choice (must be 1 or 2): %r' + raise ValueError('unknown delta choice (must be 1 or 2): %r' % which) prefixes = (" ", tag) for line in delta: diff --git a/seahub/utils/http.py b/seahub/utils/http.py index 27a641f19c..7a69bfcadb 100644 --- a/seahub/utils/http.py +++ b/seahub/utils/http.py @@ -1,5 +1,5 @@ # Copyright (c) 2012-2016 Seafile Ltd. -from __future__ import unicode_literals + import json @@ -25,9 +25,9 @@ def json_response(func): def wrapped(*a, **kw): try: result = func(*a, **kw) - except BadRequestException, e: + except BadRequestException as e: return HttpResponseBadRequest(e.message) - except RequestForbbiddenException, e: + except RequestForbbiddenException as e: return HttpResponseForbidden(e.messages) if isinstance(result, HttpResponse): return result diff --git a/seahub/utils/ms_excel.py b/seahub/utils/ms_excel.py index e73dab43b7..c774d8184c 100644 --- a/seahub/utils/ms_excel.py +++ b/seahub/utils/ms_excel.py @@ -20,14 +20,14 @@ def write_xls(sheet_name, head, data_list): row_num = 0 # write table head - for col_num in xrange(len(head)): + for col_num in range(len(head)): c = ws.cell(row = row_num + 1, column = col_num + 1) c.value = head[col_num] # write table data for row in data_list: row_num += 1 - for col_num in xrange(len(row)): + for col_num in range(len(row)): c = ws.cell(row = row_num + 1, column = col_num + 1) c.value = row[col_num] diff --git a/seahub/utils/paginator.py b/seahub/utils/paginator.py index 20ed38c3d9..79945d082e 100644 --- a/seahub/utils/paginator.py +++ b/seahub/utils/paginator.py @@ -11,7 +11,7 @@ def get_page_range(current_page, num_pages): else: first_page = current_page - 5 last_page = current_page + 4 if current_page + 4 < num_pages else num_pages - return range(first_page, last_page + 1) + return list(range(first_page, last_page + 1)) class Paginator(DefaultPaginator): def get_page_range(self, current_page=1): diff --git a/seahub/utils/repo.py b/seahub/utils/repo.py index ad9bd9f360..e000e77973 100644 --- a/seahub/utils/repo.py +++ b/seahub/utils/repo.py @@ -263,7 +263,7 @@ def get_related_users_by_repo(repo_id, org_id=None): users = [] # 1. users repo has been shared to - if org_id > 0: + if org_id and org_id > 0: users.extend(seafile_api.org_get_shared_users_by_repo(org_id, repo_id)) owner = seafile_api.get_org_repo_owner(repo_id) else: diff --git a/seahub/utils/slugify/__init__.py b/seahub/utils/slugify/__init__.py index 229f4eec95..35d402aabb 100644 --- a/seahub/utils/slugify/__init__.py +++ b/seahub/utils/slugify/__init__.py @@ -2,7 +2,7 @@ import re import unicodedata -from django.utils.encoding import smart_unicode +from django.utils.encoding import smart_text # Extra characters outside of alphanumerics that we'll allow. SLUG_OK = '-_~' @@ -12,7 +12,7 @@ def slugify(s, ok=SLUG_OK, lower=True, spaces=False): # L and N signify letter/number. # http://www.unicode.org/reports/tr44/tr44-4.html#GC_Values_Table rv = [] - for c in unicodedata.normalize('NFKC', smart_unicode(s)): + for c in unicodedata.normalize('NFKC', smart_text(s)): cat = unicodedata.category(c)[0] if cat in 'LN' or c in ok: rv.append(c) diff --git a/seahub/utils/star.py b/seahub/utils/star.py index d548b55d78..2d9a40bf67 100644 --- a/seahub/utils/star.py +++ b/seahub/utils/star.py @@ -22,7 +22,7 @@ def star_file(email, repo_id, path, is_dir, org_id=-1): is_dir=is_dir) try: f.save() - except IntegrityError, e: + except IntegrityError as e: logger.warn(e) def unstar_file(email, repo_id, path): diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py index cd2ccd6f72..d1e76a2723 100644 --- a/seahub/views/__init__.py +++ b/seahub/views/__init__.py @@ -21,7 +21,7 @@ from django.views.decorators.http import condition import seaserv from seaserv import get_repo, get_commits, \ - seafserv_threaded_rpc, seafserv_rpc, is_repo_owner, \ + seafserv_threaded_rpc, is_repo_owner, \ get_file_size, MAX_DOWNLOAD_DIR_SIZE, \ seafile_api, ccnet_api from pysearpc import SearpcError @@ -136,7 +136,7 @@ def gen_path_link(path, repo_name): paths.insert(0, repo_name) links.insert(0, '/') - zipped = zip(paths, links) + zipped = list(zip(paths, links)) return zipped @@ -299,8 +299,8 @@ def render_recycle_dir(request, repo_id, commit_id, referer): except SearpcError as e: logger.error(e) referer = request.META.get('HTTP_REFERER', None) - next = settings.SITE_ROOT if referer is None else referer - return HttpResponseRedirect(next) + next_page = settings.SITE_ROOT if referer is None else referer + return HttpResponseRedirect(next_page) if not commit: raise Http404 @@ -361,8 +361,8 @@ def render_dir_recycle_dir(request, repo_id, commit_id, dir_path, referer): except SearpcError as e: logger.error(e) referer = request.META.get('HTTP_REFERER', None) - next = settings.SITE_ROOT if referer is None else referer - return HttpResponseRedirect(next) + next_page = settings.SITE_ROOT if referer is None else referer + return HttpResponseRedirect(next_page) if not commit: raise Http404 @@ -394,7 +394,7 @@ def render_dir_recycle_dir(request, repo_id, commit_id, dir_path, referer): def repo_recycle_view(request, repo_id): if not seafile_api.get_dir_id_by_path(repo_id, '/') or \ check_folder_permission(request, repo_id, '/') != 'rw': - return render_permission_error(request, _(u'Unable to view recycle page')) + return render_permission_error(request, _('Unable to view recycle page')) commit_id = request.GET.get('commit_id', '') referer = request.GET.get('referer', '') # for back to 'dir view' page @@ -409,7 +409,7 @@ def dir_recycle_view(request, repo_id): if not seafile_api.get_dir_id_by_path(repo_id, dir_path) or \ check_folder_permission(request, repo_id, dir_path) != 'rw': - return render_permission_error(request, _(u'Unable to view recycle page')) + return render_permission_error(request, _('Unable to view recycle page')) commit_id = request.GET.get('commit_id', '') referer = request.GET.get('referer', '') # for back to 'dir view' page @@ -424,7 +424,7 @@ def repo_folder_trash(request, repo_id): if not seafile_api.get_dir_id_by_path(repo_id, path) or \ check_folder_permission(request, repo_id, path) != 'rw': - return render_permission_error(request, _(u'Unable to view recycle page')) + return render_permission_error(request, _('Unable to view recycle page')) repo = get_repo(repo_id) if not repo: @@ -469,7 +469,7 @@ def repo_history(request, repo_id): """ user_perm = check_folder_permission(request, repo_id, '/') if not user_perm: - return render_permission_error(request, _(u'Unable to view library modification')) + return render_permission_error(request, _('Unable to view library modification')) repo = get_repo(repo_id) if not repo: @@ -486,10 +486,10 @@ def repo_history(request, repo_id): if repo.props.encrypted and \ (repo.enc_version == 1 or (repo.enc_version == 2 and server_crypto)): try: - ret = seafserv_rpc.is_passwd_set(repo_id, username) + ret = seafile_api.is_password_set(repo_id, username) if ret == 1: password_set = True - except SearpcError, e: + except SearpcError as e: return render_error(request, e.msg) if not password_set: @@ -546,14 +546,14 @@ def repo_history(request, repo_id): @require_POST def repo_revert_history(request, repo_id): - next = request.META.get('HTTP_REFERER', None) - if not next: - next = settings.SITE_ROOT + next_page = request.META.get('HTTP_REFERER', None) + if not next_page: + next_page = settings.SITE_ROOT repo = get_repo(repo_id) if not repo: messages.error(request, _("Library does not exist")) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) # perm check perm = check_folder_permission(request, repo_id, '/') @@ -562,7 +562,7 @@ def repo_revert_history(request, repo_id): if perm is None or repo_owner != username: messages.error(request, _("Permission denied")) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) try: server_crypto = UserOptions.objects.is_server_crypto(username) @@ -574,10 +574,10 @@ def repo_revert_history(request, repo_id): if repo.props.encrypted and \ (repo.enc_version == 1 or (repo.enc_version == 2 and server_crypto)): try: - ret = seafserv_rpc.is_passwd_set(repo_id, username) + ret = seafile_api.is_password_set(repo_id, username) if ret == 1: password_set = True - except SearpcError, e: + except SearpcError as e: return render_error(request, e.msg) if not password_set: @@ -586,22 +586,22 @@ def repo_revert_history(request, repo_id): commit_id = request.GET.get('commit_id', '') if not commit_id: - return render_error(request, _(u'Please specify history ID')) + return render_error(request, _('Please specify history ID')) try: seafserv_threaded_rpc.revert_on_server(repo_id, commit_id, request.user.username) messages.success(request, _('Successfully restored the library.')) - except SearpcError, e: + except SearpcError as e: if e.msg == 'Bad arguments': - return render_error(request, _(u'Invalid arguments.')) + return render_error(request, _('Invalid arguments.')) elif e.msg == 'No such repo': - return render_error(request, _(u'Library does not exist')) + return render_error(request, _('Library does not exist')) elif e.msg == "Commit doesn't exist": - return render_error(request, _(u'History you specified does not exist')) + return render_error(request, _('History you specified does not exist')) else: - return render_error(request, _(u'Unknown error')) + return render_error(request, _('Unknown error')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) def fpath_to_link(repo_id, path, is_dir=False): """Translate file path of a repo to its view link""" @@ -720,7 +720,7 @@ def libraries(request): if joined_groups: try: - joined_groups.sort(lambda x, y: cmp(x.group_name.lower(), y.group_name.lower())) + joined_groups.sort(key=lambda x: x.group_name.lower()) except Exception as e: logger.error(e) joined_groups = [] @@ -766,7 +766,7 @@ def libraries(request): 'joined_groups_exclude_address_book': joined_groups_exclude_address_book, 'storages': get_library_storages(request), 'unread_notifications_request_interval': UNREAD_NOTIFICATIONS_REQUEST_INTERVAL, - 'library_templates': LIBRARY_TEMPLATES.keys() if \ + 'library_templates': list(LIBRARY_TEMPLATES.keys()) if \ isinstance(LIBRARY_TEMPLATES, dict) else [], 'enable_share_to_all_groups': config.ENABLE_SHARE_TO_ALL_GROUPS, 'enable_group_discussion': settings.ENABLE_GROUP_DISCUSSION, @@ -814,12 +814,12 @@ def file_revisions(request, repo_id): """ repo = get_repo(repo_id) if not repo: - error_msg = _(u"Library does not exist") + error_msg = _("Library does not exist") return render_error(request, error_msg) # perm check if not check_folder_permission(request, repo_id, '/'): - error_msg = _(u"Permission denied.") + error_msg = _("Permission denied.") return render_error(request, error_msg) path = request.GET.get('p', '/') @@ -934,10 +934,10 @@ def list_inner_pub_repos(request): username = request.user.username if is_org_context(request): org_id = request.user.org.org_id - return seaserv.list_org_inner_pub_repos(org_id, username) + return seafile_api.list_org_inner_pub_repos(org_id) if not request.cloud_mode: - return seaserv.list_inner_pub_repos(username) + return seafile_api.get_inner_pub_repo_list() return [] @@ -947,7 +947,7 @@ def i18n(request): """ from django.conf import settings - next = request.META.get('HTTP_REFERER', settings.SITE_ROOT) + next_page = request.META.get('HTTP_REFERER', settings.SITE_ROOT) lang = request.GET.get('lang', settings.LANGUAGE_CODE) if lang not in [e[0] for e in settings.LANGUAGES]: @@ -965,7 +965,7 @@ def i18n(request): Profile.objects.add_or_update(request.user.username, '', '', lang) # set language code to client - res = HttpResponseRedirect(next) + res = HttpResponseRedirect(next_page) res.set_cookie(settings.LANGUAGE_COOKIE_NAME, lang, max_age=30*24*60*60) return res @@ -973,7 +973,7 @@ def i18n(request): def repo_download_dir(request, repo_id): repo = get_repo(repo_id) if not repo: - return render_error(request, _(u'Library does not exist')) + return render_error(request, _('Library does not exist')) path = request.GET.get('p', '/') if path[-1] != '/': # Normalize dir path @@ -997,12 +997,12 @@ def repo_download_dir(request, repo_id): try: total_size = seafile_api.get_dir_size(repo.store_id, repo.version, dir_id) - except Exception, e: + except Exception as e: logger.error(str(e)) - return render_error(request, _(u'Internal Error')) + return render_error(request, _('Internal Error')) if total_size > MAX_DOWNLOAD_DIR_SIZE: - return render_error(request, _(u'Unable to download directory "%s": size is too large.') % dirname) + return render_error(request, _('Unable to download directory "%s": size is too large.') % dirname) is_windows = 0 if is_windows_operating_system(request): @@ -1018,10 +1018,10 @@ def repo_download_dir(request, repo_id): repo_id, json.dumps(fake_obj_id), 'download-dir', request.user.username) if not token: - return render_error(request, _(u'Internal Server Error')) + return render_error(request, _('Internal Server Error')) else: - return render_error(request, _(u'Unable to download "%s"') % dirname ) + return render_error(request, _('Unable to download "%s"') % dirname ) url = gen_file_get_url(token, dirname) from seahub.views.file import send_file_access_msg @@ -1137,7 +1137,7 @@ def toggle_modules(request): raise Http404 referer = request.META.get('HTTP_REFERER', None) - next = settings.SITE_ROOT if referer is None else referer + next_page = settings.SITE_ROOT if referer is None else referer username = request.user.username personal_wiki = request.POST.get('personal_wiki', 'off') @@ -1147,10 +1147,10 @@ def toggle_modules(request): else: disable_mod_for_user(username, MOD_PERSONAL_WIKI) if referer.find('wiki') > 0: - next = settings.SITE_ROOT + next_page = settings.SITE_ROOT messages.success(request, _('Successfully disable "Personal Wiki".')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) storage = get_avatar_file_storage() def latest_entry(request, filename): @@ -1166,7 +1166,7 @@ def image_view(request, filename): raise Http404 # read file from cache, if hit - filename_md5 = hashlib.md5(filename).hexdigest() + filename_md5 = hashlib.md5(filename.encode('utf-8')).hexdigest() cache_key = 'image_view__%s' % filename_md5 file_content = cache.get(cache_key) if file_content is None: diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py index 0cd584657d..2d7eb2bd3e 100644 --- a/seahub/views/ajax.py +++ b/seahub/views/ajax.py @@ -7,7 +7,7 @@ import json import posixpath import csv import chardet -import StringIO +import io from django.core.urlresolvers import reverse from django.http import HttpResponse, Http404 @@ -20,7 +20,7 @@ from django.conf import settings as dj_settings from django.template.defaultfilters import filesizeformat import seaserv -from seaserv import seafile_api, is_passwd_set, ccnet_api, \ +from seaserv import seafile_api, ccnet_api, \ seafserv_threaded_rpc from pysearpc import SearpcError @@ -82,7 +82,7 @@ def get_dirents(request, repo_id): # permission checking user_perm = check_folder_permission(request, repo_id, '/') if user_perm is None: - err_msg = _(u"You don't have permission to access the library.") + err_msg = _("You don't have permission to access the library.") return HttpResponse(json.dumps({"err_msg": err_msg}), status=403, content_type=content_type) @@ -90,7 +90,7 @@ def get_dirents(request, repo_id): dir_only = request.GET.get('dir_only', False) all_dir = request.GET.get('all_dir', False) if not path: - err_msg = _(u"No path.") + err_msg = _("No path.") return HttpResponse(json.dumps({"error": err_msg}), status=400, content_type=content_type) @@ -101,8 +101,8 @@ def get_dirents(request, repo_id): for i, x in enumerate(path_eles): ele_path = '/'.join(path_eles[:i+1]) + '/' try: - ele_path_dirents = seafile_api.list_dir_by_path(repo_id, ele_path.encode('utf-8')) - except SearpcError, e: + ele_path_dirents = seafile_api.list_dir_by_path(repo_id, ele_path) + except SearpcError as e: ele_path_dirents = [] ds = [] for d in ele_path_dirents: @@ -111,14 +111,14 @@ def get_dirents(request, repo_id): 'name': d.obj_name, 'parent_dir': ele_path }) - ds.sort(lambda x, y : cmp(x['name'].lower(), y['name'].lower())) + ds.sort(key=lambda x: x['name'].lower()) all_dirents.extend(ds) return HttpResponse(json.dumps(all_dirents), content_type=content_type) # get dirents in path try: - dirents = seafile_api.list_dir_by_path(repo_id, path.encode('utf-8')) - except SearpcError, e: + dirents = seafile_api.list_dir_by_path(repo_id, path) + except SearpcError as e: return HttpResponse(json.dumps({"error": e.msg}), status=500, content_type=content_type) @@ -139,8 +139,8 @@ def get_dirents(request, repo_id): } f_list.append(f) - d_list.sort(lambda x, y : cmp(x['name'].lower(), y['name'].lower())) - f_list.sort(lambda x, y : cmp(x['name'].lower(), y['name'].lower())) + d_list.sort(key=lambda x: x['name'].lower()) + f_list.sort(key=lambda x: x['name'].lower()) return HttpResponse(json.dumps(d_list + f_list), content_type=content_type) @login_required_ajax @@ -155,13 +155,13 @@ def get_unenc_group_repos(request, group_id): group_id_int = int(group_id) group = get_group(group_id_int) if not group: - err_msg = _(u"The group doesn't exist") + err_msg = _("The group doesn't exist") return HttpResponse(json.dumps({"error": err_msg}), status=400, content_type=content_type) joined = is_group_member(group_id_int, request.user.username) if not joined and not request.user.is_staff: - err_msg = _(u"Permission denied") + err_msg = _("Permission denied") return HttpResponse(json.dumps({"error": err_msg}), status=403, content_type=content_type) @@ -178,7 +178,7 @@ def get_unenc_group_repos(request, group_id): if not repo.encrypted: repo_list.append({"name": repo.name, "id": repo.id}) - repo_list.sort(lambda x, y : cmp(x['name'].lower(), y['name'].lower())) + repo_list.sort(key=lambda x: x['name'].lower()) return HttpResponse(json.dumps(repo_list), content_type=content_type) @login_required_ajax @@ -195,7 +195,7 @@ def unenc_rw_repos(request): for repo in acc_repos: repo_list.append({"name": repo.name, "id": repo.id}) - repo_list.sort(lambda x, y: cmp(x['name'].lower(), y['name'].lower())) + repo_list.sort(key=lambda x: x['name'].lower()) return HttpResponse(json.dumps(repo_list), content_type=content_type) def convert_repo_path_when_can_not_view_folder(request, repo_id, path): @@ -206,7 +206,7 @@ def convert_repo_path_when_can_not_view_folder(request, repo_id, path): username = request.user.username converted_repo_path = seafile_api.convert_repo_path(repo_id, path, username) if not converted_repo_path: - err_msg = _(u'Permission denied.') + err_msg = _('Permission denied.') return HttpResponse(json.dumps({'error': err_msg}), status=403, content_type=content_type) @@ -228,7 +228,7 @@ def convert_repo_path_when_can_not_view_folder(request, repo_id, path): status=404, content_type=content_type) group_id = '' - if converted_repo_path.has_key('group_id'): + if 'group_id' in converted_repo_path: group_id = converted_repo_path['group_id'] if not ccnet_api.get_group(group_id): err_msg = 'Group not found.' @@ -236,13 +236,13 @@ def convert_repo_path_when_can_not_view_folder(request, repo_id, path): status=404, content_type=content_type) if not is_group_member(group_id, username): - err_msg = _(u'Permission denied.') + err_msg = _('Permission denied.') return HttpResponse(json.dumps({'error': err_msg}), status=403, content_type=content_type) user_perm = check_folder_permission(request, repo_id, path) if not user_perm: - err_msg = _(u'Permission denied.') + err_msg = _('Permission denied.') return HttpResponse(json.dumps({'error': err_msg}), status=403, content_type=content_type) @@ -263,7 +263,7 @@ def list_lib_dir(request, repo_id): repo = get_repo(repo_id) if not repo: - err_msg = _(u'Library does not exist.') + err_msg = _('Library does not exist.') return HttpResponse(json.dumps({'error': err_msg}), status=400, content_type=content_type) @@ -284,13 +284,13 @@ def list_lib_dir(request, repo_id): if repo.encrypted \ and not seafile_api.is_password_set(repo.id, username): - err_msg = _(u'Library is encrypted.') + err_msg = _('Library is encrypted.') return HttpResponse(json.dumps({'error': err_msg, 'lib_need_decrypt': True}), status=403, content_type=content_type) head_commit = get_commit(repo.id, repo.version, repo.head_cmmt_id) if not head_commit: - err_msg = _(u'Error: no head commit id') + err_msg = _('Error: no head commit id') return HttpResponse(json.dumps({'error': err_msg}), status=500, content_type=content_type) @@ -433,7 +433,7 @@ def rename_dirent(request, repo_id): repo = get_repo(repo_id) if not repo: - result['error'] = _(u'Library does not exist.') + result['error'] = _('Library does not exist.') return HttpResponse(json.dumps(result), status=400, content_type=content_type) @@ -450,7 +450,7 @@ def rename_dirent(request, repo_id): oldname = form.cleaned_data["oldname"] newname = form.cleaned_data["newname"] else: - result['error'] = str(form.errors.values()[0]) + result['error'] = str(list(form.errors.values())[0]) return HttpResponse(json.dumps(result), status=400, content_type=content_type) @@ -492,7 +492,7 @@ def rename_dirent(request, repo_id): # rename file/dir try: seafile_api.rename_file(repo_id, parent_dir, oldname, newname, username) - except SearpcError, e: + except SearpcError as e: result['error'] = str(e) return HttpResponse(json.dumps(result), status=500, content_type=content_type) @@ -510,7 +510,7 @@ def delete_dirent(request, repo_id): repo = get_repo(repo_id) if not repo: - err_msg = _(u'Library does not exist.') + err_msg = _('Library does not exist.') return HttpResponse(json.dumps({'error': err_msg}), status=400, content_type=content_type) @@ -518,7 +518,7 @@ def delete_dirent(request, repo_id): parent_dir = request.GET.get("parent_dir", None) dirent_name = request.GET.get("name", None) if not (parent_dir and dirent_name): - err_msg = _(u'Argument missing.') + err_msg = _('Argument missing.') return HttpResponse(json.dumps({'error': err_msg}), status=400, content_type=content_type) @@ -558,9 +558,9 @@ def delete_dirent(request, repo_id): seafile_api.del_file(repo_id, parent_dir, dirent_name, username) return HttpResponse(json.dumps({'success': True}), content_type=content_type) - except SearpcError, e: + except SearpcError as e: logger.error(e) - err_msg = _(u'Internal error. Failed to delete %s.') % escape(dirent_name) + err_msg = _('Internal error. Failed to delete %s.') % escape(dirent_name) return HttpResponse(json.dumps({'error': err_msg}), status=500, content_type=content_type) @@ -574,7 +574,7 @@ def delete_dirents(request, repo_id): repo = get_repo(repo_id) if not repo: - err_msg = _(u'Library does not exist.') + err_msg = _('Library does not exist.') return HttpResponse(json.dumps({'error': err_msg}), status=400, content_type=content_type) @@ -582,7 +582,7 @@ def delete_dirents(request, repo_id): parent_dir = request.GET.get("parent_dir") dirents_names = request.POST.getlist('dirents_names') if not (parent_dir and dirents_names): - err_msg = _(u'Argument missing.') + err_msg = _('Argument missing.') return HttpResponse(json.dumps({'error': err_msg}), status=400, content_type=content_type) @@ -599,7 +599,7 @@ def delete_dirents(request, repo_id): undeleted += dirents_names else: for dirent_name in dirents_names: - if dirent_name not in locked_files.keys(): + if dirent_name not in list(locked_files.keys()): # file is not locked allowed_dirents_names.append(dirent_name) elif locked_files[dirent_name] == username: @@ -620,7 +620,7 @@ def delete_dirents(request, repo_id): try: seafile_api.del_file(repo_id, parent_dir, multi_files, username) - except SearpcError, e: + except SearpcError as e: logger.error(e) return HttpResponse(json.dumps({'deleted': deleted, 'undeleted': undeleted}), @@ -640,7 +640,7 @@ def dirents_copy_move_common(): repo = get_repo(repo_id) if not repo: - result['error'] = _(u'Library does not exist.') + result['error'] = _('Library does not exist.') return HttpResponse(json.dumps(result), status=400, content_type=content_type) @@ -707,7 +707,7 @@ def dirents_copy_move_common(): out_of_quota = False except Exception as e: logger.error(e) - result['error'] = _(u'Internal server error') + result['error'] = _('Internal server error') return HttpResponse(json.dumps(result), status=500, content_type=content_type) @@ -747,7 +747,7 @@ def mv_dirents(request, src_repo_id, src_path, dst_repo_id, dst_path, failed += obj_file_names else: for file_name in obj_file_names: - if file_name not in locked_files.keys(): + if file_name not in list(locked_files.keys()): # file is not locked allowed_files.append(file_name) elif locked_files[file_name] == username: @@ -759,7 +759,7 @@ def mv_dirents(request, src_repo_id, src_path, dst_repo_id, dst_path, for obj_name in obj_dir_names: src_dir = posixpath.join(src_path, obj_name) if dst_path.startswith(src_dir + '/'): - error_msg = _(u'Can not move directory %(src)s to its subdirectory %(des)s') \ + error_msg = _('Can not move directory %(src)s to its subdirectory %(des)s') \ % {'src': escape(src_dir), 'des': escape(dst_path)} result['error'] = error_msg return HttpResponse(json.dumps(result), status=400, content_type=content_type) @@ -796,7 +796,7 @@ def mv_dirents(request, src_repo_id, src_path, dst_repo_id, dst_path, # check if above quota for dst repo if seafile_api.check_quota(dst_repo_id, total_size) < 0: - return HttpResponse(json.dumps({'error': _(u"Out of quota.")}), + return HttpResponse(json.dumps({'error': _("Out of quota.")}), status=443, content_type=content_type) success = [] @@ -831,7 +831,7 @@ def cp_dirents(request, src_repo_id, src_path, dst_repo_id, dst_path, obj_file_n if parse_repo_perm(check_folder_permission( request, src_repo_id, src_path)).can_copy is False: - error_msg = _(u'You do not have permission to copy files/folders in this directory') + error_msg = _('You do not have permission to copy files/folders in this directory') result['error'] = error_msg return HttpResponse(json.dumps(result), status=403, content_type=content_type) @@ -840,7 +840,7 @@ def cp_dirents(request, src_repo_id, src_path, dst_repo_id, dst_path, obj_file_n src_dir = posixpath.join(src_path, obj_name) src_dir = normalize_dir_path(src_dir) if dst_path.startswith(src_dir): - error_msg = _(u'Can not copy directory %(src)s to its subdirectory %(des)s') \ + error_msg = _('Can not copy directory %(src)s to its subdirectory %(des)s') \ % {'src': escape(src_dir), 'des': escape(dst_path)} result['error'] = error_msg return HttpResponse(json.dumps(result), status=400, content_type=content_type) @@ -869,7 +869,7 @@ def cp_dirents(request, src_repo_id, src_path, dst_repo_id, dst_path, obj_file_n # check if above quota for dst repo if seafile_api.check_quota(dst_repo_id, total_size) < 0: - return HttpResponse(json.dumps({'error': _(u"Out of quota.")}), + return HttpResponse(json.dumps({'error': _("Out of quota.")}), status=443, content_type=content_type) failed = [] @@ -902,14 +902,14 @@ def get_current_commit(request, repo_id): repo = get_repo(repo_id) if not repo: - err_msg = _(u'Library does not exist.') + err_msg = _('Library does not exist.') return HttpResponse(json.dumps({'error': err_msg}), status=400, content_type=content_type) username = request.user.username user_perm = check_folder_permission(request, repo_id, '/') if user_perm is None: - err_msg = _(u'Permission denied.') + err_msg = _('Permission denied.') return HttpResponse(json.dumps({'error': err_msg}), status=403, content_type=content_type) @@ -922,13 +922,13 @@ def get_current_commit(request, repo_id): if repo.encrypted and \ (repo.enc_version == 1 or (repo.enc_version == 2 and server_crypto)) \ and not seafile_api.is_password_set(repo.id, username): - err_msg = _(u'Library is encrypted.') + err_msg = _('Library is encrypted.') return HttpResponse(json.dumps({'error': err_msg}), status=403, content_type=content_type) head_commit = get_commit(repo.id, repo.version, repo.head_cmmt_id) if not head_commit: - err_msg = _(u'Error: no head commit id') + err_msg = _('Error: no head commit id') return HttpResponse(json.dumps({'error': err_msg}), status=500, content_type=content_type) @@ -955,14 +955,14 @@ def download_enc_file(request, repo_id, file_id): blklist = [] if file_id == EMPTY_SHA1: - result = { 'blklist':blklist, 'url':None, } + result = { 'blklist': blklist, 'url': None, } return HttpResponse(json.dumps(result), content_type=content_type) try: blks = seafile_api.list_blocks_by_file_id(repo_id, file_id) except SearpcError as e: logger.error(e) - result['error'] = _(u'Failed to get file block list') + result['error'] = _('Failed to get file block list') return HttpResponse(json.dumps(result), content_type=content_type) blklist = blks.split('\n') @@ -971,13 +971,13 @@ def download_enc_file(request, repo_id, file_id): file_id, op, request.user.username) if not token: - result['error'] = _(u'FileServer access token invalid.') + result['error'] = _('FileServer access token invalid.') return HttpResponse(json.dumps(result), content_type=content_type) url = gen_block_get_url(token, None) result = { - 'blklist':blklist, - 'url':url, + 'blklist': blklist, + 'url': url, } return HttpResponse(json.dumps(result), content_type=content_type) @@ -1193,7 +1193,7 @@ def repo_history_changes(request, repo_id): repo = get_repo(repo_id) if not repo: - err_msg = _(u'Library does not exist.') + err_msg = _('Library does not exist.') return HttpResponse(json.dumps({'error': err_msg}), status=400, content_type=content_type) @@ -1202,7 +1202,7 @@ def repo_history_changes(request, repo_id): if request.user.is_staff is True: pass # Allow system staff to check repo changes else: - err_msg = _(u"Permission denied") + err_msg = _("Permission denied") return HttpResponse(json.dumps({"error": err_msg}), status=403, content_type=content_type) @@ -1215,14 +1215,14 @@ def repo_history_changes(request, repo_id): if repo.encrypted and \ (repo.enc_version == 1 or (repo.enc_version == 2 and server_crypto)) \ - and not is_passwd_set(repo_id, username): - err_msg = _(u'Library is encrypted.') + and not seafile_api.is_password_set(repo_id, username): + err_msg = _('Library is encrypted.') return HttpResponse(json.dumps({'error': err_msg}), status=403, content_type=content_type) commit_id = request.GET.get('commit_id', '') if not commit_id: - err_msg = _(u'Argument missing') + err_msg = _('Argument missing') return HttpResponse(json.dumps({'error': err_msg}), status=400, content_type=content_type) @@ -1295,7 +1295,7 @@ def ajax_group_members_import(request, group_id): if encoding != 'utf-8': content = content.decode(encoding, 'replace').encode('utf-8') - filestream = StringIO.StringIO(content) + filestream = io.StringIO(content) reader = csv.reader(filestream) except Exception as e: logger.error(e) @@ -1335,7 +1335,7 @@ def ajax_group_members_import(request, group_id): if is_group_member(group_id, email, in_structure=False): result['failed'].append({ 'email': email, - 'error_msg': _(u'User %s is already a group member.') % email + 'error_msg': _('User %s is already a group member.') % email }) continue @@ -1344,7 +1344,7 @@ def ajax_group_members_import(request, group_id): seaserv.ccnet_threaded_rpc.org_user_exists(org_id, email): result['failed'].append({ 'email': email, - 'error_msg': _(u'User %s not found in organization.') % email + 'error_msg': _('User %s not found in organization.') % email }) continue @@ -1411,8 +1411,8 @@ def ajax_repo_dir_recycle_more(request, repo_id): dirent.is_dir = False # Entries sort by deletion time in descending order. - deleted_entries.sort(lambda x, y : cmp(y.delete_time, - x.delete_time)) + deleted_entries.sort( + key=lambda x: x.delete_time, reverse=True) ctx = { 'show_recycle_root': True, diff --git a/seahub/views/file.py b/seahub/views/file.py index b723a40e1e..ba7305b8a3 100644 --- a/seahub/views/file.py +++ b/seahub/views/file.py @@ -9,13 +9,13 @@ import sys import os import json import stat -import urllib2 +import urllib.request, urllib.error, urllib.parse import chardet import logging import posixpath import re import mimetypes -import urlparse +import urllib.parse import datetime from django.core import signing @@ -34,7 +34,7 @@ from django.template.defaultfilters import filesizeformat from django.views.decorators.csrf import csrf_exempt from seaserv import seafile_api, ccnet_api -from seaserv import get_repo, send_message, get_commits, \ +from seaserv import get_repo, get_commits, \ get_file_id_by_path, get_commit, get_file_size, \ seafserv_threaded_rpc from pysearpc import SearpcError @@ -157,7 +157,7 @@ def gen_path_link(path, repo_name): paths.insert(0, repo_name) links.insert(0, '/') - zipped = zip(paths, links) + zipped = list(zip(paths, links)) return zipped @@ -178,22 +178,22 @@ def repo_file_get(raw_path, file_enc): encoding = file_enc try: - file_response = urllib2.urlopen(raw_path) + file_response = urllib.request.urlopen(raw_path) content = file_response.read() - except urllib2.HTTPError as e: + except urllib.error.HTTPError as e: logger.error(e) - err = _(u'HTTPError: failed to open file online') + err = _('HTTPError: failed to open file online') return err, '', None - except urllib2.URLError as e: + except urllib.error.URLError as e: logger.error(e) - err = _(u'URLError: failed to open file online') + err = _('URLError: failed to open file online') return err, '', None else: if encoding: try: u_content = content.decode(encoding) except UnicodeDecodeError: - err = _(u'The encoding you chose is not proper.') + err = _('The encoding you chose is not proper.') return err, '', encoding else: for enc in FILE_ENCODING_TRY_LIST: @@ -210,10 +210,10 @@ def repo_file_get(raw_path, file_enc): try: u_content = content.decode(encoding) except UnicodeDecodeError: - err = _(u'Unknown file encoding') + err = _('Unknown file encoding') return err, '', '' else: - err = _(u'Unknown file encoding') + err = _('Unknown file encoding') return err, '', '' file_content = u_content @@ -334,7 +334,7 @@ def can_preview_file(file_name, file_size, repo): # TEXT, MARKDOWN, IMAGE, DOCUMENT, SPREADSHEET, VIDEO, AUDIO, PDF, SVG, DRAW if filetype in (TEXT, MARKDOWN, IMAGE) or fileext in get_conf_text_ext(): if file_size > FILE_PREVIEW_MAX_SIZE: - error_msg = _(u'File size surpasses %s, can not be opened online.') % \ + error_msg = _('File size surpasses %s, can not be opened online.') % \ filesizeformat(FILE_PREVIEW_MAX_SIZE) return False, error_msg @@ -344,7 +344,7 @@ def can_preview_file(file_name, file_size, repo): elif filetype in (DOCUMENT, SPREADSHEET): if repo.encrypted: - error_msg = _(u'The library is encrypted, can not open file online.') + error_msg = _('The library is encrypted, can not open file online.') return False, error_msg if not HAS_OFFICE_CONVERTER and \ @@ -372,12 +372,12 @@ def can_preview_file(file_name, file_size, repo): # HAS_OFFICE_CONVERTER if file_size > OFFICE_PREVIEW_MAX_SIZE: - error_msg = _(u'File size surpasses %s, can not be opened online.') % \ + error_msg = _('File size surpasses %s, can not be opened online.') % \ filesizeformat(OFFICE_PREVIEW_MAX_SIZE) return False, error_msg else: # NOT depends on Seafile settings - if filetype not in PREVIEW_FILEEXT.keys(): + if filetype not in list(PREVIEW_FILEEXT.keys()): error_msg = "File preview unsupported" return False, error_msg @@ -439,7 +439,7 @@ def convert_repo_path_when_can_not_view_file(request, repo_id, path): username = request.user.username converted_repo_path = seafile_api.convert_repo_path(repo_id, path, username) if not converted_repo_path: - return render_permission_error(request, _(u'Unable to view file')) + return render_permission_error(request, _('Unable to view file')) converted_repo_path = json.loads(converted_repo_path) @@ -452,21 +452,21 @@ def convert_repo_path_when_can_not_view_file(request, repo_id, path): path = normalize_file_path(path) file_id = seafile_api.get_file_id_by_path(repo_id, path) if not file_id: - return render_error(request, _(u'File does not exist')) + return render_error(request, _('File does not exist')) group_id = '' - if converted_repo_path.has_key('group_id'): + if 'group_id' in converted_repo_path: group_id = converted_repo_path['group_id'] if not ccnet_api.get_group(group_id): - return render_error(request, _(u'Group does not exist')) + return render_error(request, _('Group does not exist')) if not is_group_member(group_id, username): - return render_permission_error(request, _(u'Unable to view file')) + return render_permission_error(request, _('Unable to view file')) parent_dir = os.path.dirname(path) permission = check_folder_permission(request, repo_id, parent_dir) if not permission: - return render_permission_error(request, _(u'Unable to view file')) + return render_permission_error(request, _('Unable to view file')) next_url = reverse('view_lib_file', args=[repo_id, path]) return HttpResponseRedirect(next_url) @@ -483,7 +483,7 @@ def view_lib_file(request, repo_id, path): path = normalize_file_path(path) file_id = seafile_api.get_file_id_by_path(repo_id, path) if not file_id: - return render_error(request, _(u'File does not exist')) + return render_error(request, _('File does not exist')) # permission check username = request.user.username @@ -507,7 +507,7 @@ def view_lib_file(request, repo_id, path): use_onetime=settings.FILESERVER_TOKEN_ONCE_ONLY) if not token: - return render_permission_error(request, _(u'Unable to view file')) + return render_permission_error(request, _('Unable to view file')) dl_or_raw_url = gen_file_get_url(token, filename) @@ -540,7 +540,7 @@ def view_lib_file(request, repo_id, path): } # check whether file is starred - is_starred = is_file_starred(username, repo_id, path.encode('utf-8'), org_id) + is_starred = is_file_starred(username, repo_id, path, org_id) return_dict['is_starred'] = is_starred # check file lock info @@ -619,7 +619,7 @@ def view_lib_file(request, repo_id, path): # get file size if file_size > FILE_PREVIEW_MAX_SIZE: - error_msg = _(u'File size surpasses %s, can not be opened online.') % \ + error_msg = _('File size surpasses %s, can not be opened online.') % \ filesizeformat(FILE_PREVIEW_MAX_SIZE) return_dict['err'] = error_msg @@ -659,7 +659,7 @@ def view_lib_file(request, repo_id, path): # get file size if file_size > FILE_PREVIEW_MAX_SIZE: - error_msg = _(u'File size surpasses %s, can not be opened online.') % \ + error_msg = _('File size surpasses %s, can not be opened online.') % \ filesizeformat(FILE_PREVIEW_MAX_SIZE) return_dict['err'] = error_msg @@ -736,7 +736,7 @@ def view_lib_file(request, repo_id, path): elif filetype == XMIND: xmind_image_path = get_thumbnail_image_path(file_id, XMIND_IMAGE_SIZE) if not os.path.exists(xmind_image_path) and not extract_xmind_image(repo_id, path)[0]: - error_msg = _(u'Unable to view file') + error_msg = _('Unable to view file') return_dict['err'] = error_msg else: return_dict['xmind_image_src'] = urlquote(get_thumbnail_src(repo_id, XMIND_IMAGE_SIZE, path)) @@ -748,7 +748,7 @@ def view_lib_file(request, repo_id, path): elif filetype == IMAGE: if file_size > FILE_PREVIEW_MAX_SIZE: - error_msg = _(u'File size surpasses %s, can not be opened online.') % \ + error_msg = _('File size surpasses %s, can not be opened online.') % \ filesizeformat(FILE_PREVIEW_MAX_SIZE) return_dict['err'] = error_msg @@ -766,7 +766,7 @@ def view_lib_file(request, repo_id, path): img_list.append(dirent.obj_name) if len(img_list) > 1: - img_list.sort(lambda x, y : cmp(x.lower(), y.lower())) + img_list.sort(key=lambda x: x.lower()) cur_img_index = img_list.index(filename) if cur_img_index != 0: img_prev = posixpath.join(parent_dir, img_list[cur_img_index - 1]) @@ -783,7 +783,7 @@ def view_lib_file(request, repo_id, path): elif filetype in (DOCUMENT, SPREADSHEET): if repo.encrypted: - return_dict['err'] = _(u'The library is encrypted, can not open file online.') + return_dict['err'] = _('The library is encrypted, can not open file online.') return render(request, template, return_dict) if ENABLE_OFFICE_WEB_APP: @@ -817,7 +817,7 @@ def view_lib_file(request, repo_id, path): send_file_access_msg(request, repo, path, 'web') return render(request, 'view_file_wopi.html', wopi_dict) else: - return_dict['err'] = _(u'Error when prepare Office Online file preview page.') + return_dict['err'] = _('Error when prepare Office Online file preview page.') if ENABLE_ONLYOFFICE and fileext in ONLYOFFICE_FILE_EXTENSION: @@ -845,7 +845,7 @@ def view_lib_file(request, repo_id, path): send_file_access_msg(request, repo, path, 'web') return render(request, 'view_file_onlyoffice.html', onlyoffice_dict) else: - return_dict['err'] = _(u'Error when prepare OnlyOffice file preview page.') + return_dict['err'] = _('Error when prepare OnlyOffice file preview page.') if ENABLE_BISHENG_OFFICE and fileext in BISHENG_OFFICE_FILE_EXTENSION: @@ -877,7 +877,7 @@ def view_lib_file(request, repo_id, path): return render(request, template, return_dict) if file_size > OFFICE_PREVIEW_MAX_SIZE: - error_msg = _(u'File size surpasses %s, can not be opened online.') % \ + error_msg = _('File size surpasses %s, can not be opened online.') % \ filesizeformat(OFFICE_PREVIEW_MAX_SIZE) return_dict['err'] = error_msg return render(request, template, return_dict) @@ -947,7 +947,7 @@ def view_history_file_common(request, repo_id, ret_dict): send_file_access_msg(request, repo, path, 'web') ret_dict['wopi_dict'] = wopi_dict else: - ret_dict['err'] = _(u'Error when prepare Office Online file preview page.') + ret_dict['err'] = _('Error when prepare Office Online file preview page.') if ENABLE_ONLYOFFICE and fileext in ONLYOFFICE_FILE_EXTENSION: @@ -959,7 +959,7 @@ def view_history_file_common(request, repo_id, ret_dict): send_file_access_msg(request, repo, path, 'web') ret_dict['onlyoffice_dict'] = onlyoffice_dict else: - ret_dict['err'] = _(u'Error when prepare OnlyOffice file preview page.') + ret_dict['err'] = _('Error when prepare OnlyOffice file preview page.') # Check if can preview file fsize = get_file_size(repo.store_id, repo.version, obj_id) @@ -991,7 +991,7 @@ def view_history_file_common(request, repo_id, ret_dict): ret_dict['raw_path'] = raw_path ret_dict['enable_watermark'] = ENABLE_WATERMARK ret_dict['can_download_file'] = parse_repo_perm(user_perm).can_download - if not ret_dict.has_key('filetype'): + if 'filetype' not in ret_dict: ret_dict['filetype'] = filetype @repo_passwd_set_required @@ -999,13 +999,13 @@ def view_history_file(request, repo_id): ret_dict = {} view_history_file_common(request, repo_id, ret_dict) if not request.user_perm: - return render_permission_error(request, _(u'Unable to view file')) + return render_permission_error(request, _('Unable to view file')) - if ret_dict.has_key('wopi_dict'): + if 'wopi_dict' in ret_dict: wopi_dict = ret_dict['wopi_dict'] return render(request, 'view_file_wopi.html', wopi_dict) - if ret_dict.has_key('onlyoffice_dict'): + if 'onlyoffice_dict' in ret_dict: onlyoffice_dict = ret_dict['onlyoffice_dict'] return render(request, 'view_file_onlyoffice.html', onlyoffice_dict) @@ -1022,13 +1022,13 @@ def view_trash_file(request, repo_id): ret_dict = {} view_history_file_common(request, repo_id, ret_dict) if not request.user_perm: - return render_permission_error(request, _(u'Unable to view file')) + return render_permission_error(request, _('Unable to view file')) - if ret_dict.has_key('wopi_dict'): + if 'wopi_dict' in ret_dict: wopi_dict = ret_dict['wopi_dict'] return render(request, 'view_file_wopi.html', wopi_dict) - if ret_dict.has_key('onlyoffice_dict'): + if 'onlyoffice_dict' in ret_dict: onlyoffice_dict = ret_dict['onlyoffice_dict'] return render(request, 'view_file_onlyoffice.html', onlyoffice_dict) @@ -1049,13 +1049,13 @@ def view_snapshot_file(request, repo_id): ret_dict = {} view_history_file_common(request, repo_id, ret_dict) if not request.user_perm: - return render_permission_error(request, _(u'Unable to view file')) + return render_permission_error(request, _('Unable to view file')) - if ret_dict.has_key('wopi_dict'): + if 'wopi_dict' in ret_dict: wopi_dict = ret_dict['wopi_dict'] return render(request, 'view_file_wopi.html', wopi_dict) - if ret_dict.has_key('onlyoffice_dict'): + if 'onlyoffice_dict' in ret_dict: onlyoffice_dict = ret_dict['onlyoffice_dict'] return render(request, 'view_file_onlyoffice.html', onlyoffice_dict) @@ -1071,7 +1071,7 @@ def _download_file_from_share_link(request, fileshare): """Download shared file. `path` need to be provided by frontend, if missing, use `fileshare.path` """ - next = request.META.get('HTTP_REFERER', settings.SITE_ROOT) + next_page = request.META.get('HTTP_REFERER', settings.SITE_ROOT) repo = get_repo(fileshare.repo_id) if not repo: @@ -1082,8 +1082,8 @@ def _download_file_from_share_link(request, fileshare): if isinstance(fileshare, FileShare) and fileshare.is_dir_share_link(): req_path = request.GET.get('p', '') if not req_path: - messages.error(request, _(u'Unable to download file, invalid file path')) - return HttpResponseRedirect(next) + messages.error(request, _('Unable to download file, invalid file path')) + return HttpResponseRedirect(next_page) real_path = posixpath.join(fileshare.path, req_path.lstrip('/')) else: real_path = fileshare.path @@ -1091,19 +1091,19 @@ def _download_file_from_share_link(request, fileshare): filename = os.path.basename(real_path) obj_id = seafile_api.get_file_id_by_path(repo.id, real_path) if not obj_id: - messages.error(request, _(u'Unable to download file, wrong file path')) - return HttpResponseRedirect(next) + messages.error(request, _('Unable to download file, wrong file path')) + return HttpResponseRedirect(next_page) # check whether owner's traffic over the limit if user_traffic_over_limit(fileshare.username): - messages.error(request, _(u'Unable to download file, share link traffic is used up.')) - return HttpResponseRedirect(next) + messages.error(request, _('Unable to download file, share link traffic is used up.')) + return HttpResponseRedirect(next_page) dl_token = seafile_api.get_fileserver_access_token(repo.id, obj_id, 'download-link', fileshare.username, use_onetime=False) if not dl_token: - messages.error(request, _(u'Unable to download file.')) + messages.error(request, _('Unable to download file.')) return HttpResponseRedirect(gen_file_get_url(dl_token, filename)) @@ -1134,12 +1134,12 @@ def view_shared_file(request, fileshare): path = normalize_file_path(fileshare.path) obj_id = seafile_api.get_file_id_by_path(repo_id, path) if not obj_id: - return render_error(request, _(u'File does not exist')) + return render_error(request, _('File does not exist')) # permission check shared_by = fileshare.username if not seafile_api.check_permission_by_path(repo_id, '/', shared_by): - return render_error(request, _(u'Permission denied')) + return render_error(request, _('Permission denied')) # Increase file shared link view_cnt, this operation should be atomic fileshare.view_cnt = F('view_cnt') + 1 @@ -1164,7 +1164,7 @@ def view_shared_file(request, fileshare): obj_id, 'view', '', use_onetime=False) if not access_token: - return render_error(request, _(u'Unable to view file')) + return render_error(request, _('Unable to view file')) filename = os.path.basename(path) raw_path = gen_file_get_url(access_token, filename) @@ -1175,9 +1175,9 @@ def view_shared_file(request, fileshare): # check whether owner's traffic over the limit if user_traffic_over_limit(shared_by): - messages.error(request, _(u'Unable to view raw file, share link traffic is used up.')) - next = request.META.get('HTTP_REFERER', settings.SITE_ROOT) - return HttpResponseRedirect(next) + messages.error(request, _('Unable to view raw file, share link traffic is used up.')) + next_page = request.META.get('HTTP_REFERER', settings.SITE_ROOT) + return HttpResponseRedirect(next_page) # send file audit message send_file_access_msg(request, repo, path, 'share-link') @@ -1233,7 +1233,7 @@ def view_shared_file(request, fileshare): return render(request, 'view_file_wopi.html', wopi_dict) else: - ret_dict['err'] = _(u'Error when prepare Office Online file preview page.') + ret_dict['err'] = _('Error when prepare Office Online file preview page.') if ENABLE_ONLYOFFICE and fileext in ONLYOFFICE_FILE_EXTENSION: @@ -1252,7 +1252,7 @@ def view_shared_file(request, fileshare): return render(request, 'view_file_onlyoffice.html', onlyoffice_dict) else: - ret_dict['err'] = _(u'Error when prepare OnlyOffice file preview page.') + ret_dict['err'] = _('Error when prepare OnlyOffice file preview page.') file_size = seafile_api.get_file_size(repo.store_id, repo.version, obj_id) can_preview, err_msg = can_preview_file(filename, file_size, repo) @@ -1272,7 +1272,7 @@ def view_shared_file(request, fileshare): elif filetype == XMIND: xmind_image_path = get_thumbnail_image_path(obj_id, XMIND_IMAGE_SIZE) if not os.path.exists(xmind_image_path) and not extract_xmind_image(repo_id, path)[0]: - error_msg = _(u'Unable to view file') + error_msg = _('Unable to view file') ret_dict['err'] = error_msg else: raw_path = urlquote(SITE_ROOT + get_share_link_thumbnail_src(token, XMIND_IMAGE_SIZE, path)) @@ -1289,7 +1289,7 @@ def view_shared_file(request, fileshare): template = 'shared_file_view_react.html' file_share_link = request.path - desc_for_ogp = _(u'Share link for %s.') % filename + desc_for_ogp = _('Share link for %s.') % filename icon_path_for_ogp = file_icon_filter(filename, size=192) return render(request, template, { @@ -1353,12 +1353,12 @@ def view_file_via_shared_dir(request, fileshare): real_path = posixpath.join(fileshare.path, req_path.lstrip('/')) obj_id = seafile_api.get_file_id_by_path(repo_id, real_path) if not obj_id: - return render_error(request, _(u'File does not exist')) + return render_error(request, _('File does not exist')) # permission check shared_by = fileshare.username if not seafile_api.check_permission_by_path(repo_id, '/', shared_by): - return render_error(request, _(u'Permission denied')) + return render_error(request, _('Permission denied')) # download shared file if request.GET.get('dl', '') == '1': @@ -1374,7 +1374,7 @@ def view_file_via_shared_dir(request, fileshare): access_token = seafile_api.get_fileserver_access_token(repo.id, obj_id, 'view', '', use_onetime=False) if not access_token: - return render_error(request, _(u'Unable to view file')) + return render_error(request, _('Unable to view file')) filename = os.path.basename(req_path) raw_path = gen_file_get_url(access_token, filename) @@ -1385,9 +1385,9 @@ def view_file_via_shared_dir(request, fileshare): # check whether owner's traffic over the limit if user_traffic_over_limit(shared_by): - messages.error(request, _(u'Unable to view raw file, share link traffic is used up.')) - next = request.META.get('HTTP_REFERER', settings.SITE_ROOT) - return HttpResponseRedirect(next) + messages.error(request, _('Unable to view raw file, share link traffic is used up.')) + next_page = request.META.get('HTTP_REFERER', settings.SITE_ROOT) + return HttpResponseRedirect(next_page) # send file audit message send_file_access_msg(request, repo, real_path, 'share-link') @@ -1418,7 +1418,7 @@ def view_file_via_shared_dir(request, fileshare): return render(request, 'view_file_wopi.html', wopi_dict) else: - ret_dict['err'] = _(u'Error when prepare Office Online file preview page.') + ret_dict['err'] = _('Error when prepare Office Online file preview page.') if ENABLE_ONLYOFFICE and fileext in ONLYOFFICE_FILE_EXTENSION: @@ -1433,7 +1433,7 @@ def view_file_via_shared_dir(request, fileshare): return render(request, 'view_file_onlyoffice.html', onlyoffice_dict) else: - ret_dict['err'] = _(u'Error when prepare OnlyOffice file preview page.') + ret_dict['err'] = _('Error when prepare OnlyOffice file preview page.') img_prev = None img_next = None @@ -1470,7 +1470,7 @@ def view_file_via_shared_dir(request, fileshare): img_list.append(dirent.obj_name) if len(img_list) > 1: - img_list.sort(lambda x, y : cmp(x.lower(), y.lower())) + img_list.sort(key=lambda x: x.lower()) cur_img_index = img_list.index(filename) if cur_img_index != 0: img_prev = posixpath.join(parent_dir, img_list[cur_img_index - 1]) @@ -1479,7 +1479,7 @@ def view_file_via_shared_dir(request, fileshare): elif filetype == XMIND: xmind_image_path = get_thumbnail_image_path(obj_id, XMIND_IMAGE_SIZE) if not os.path.exists(xmind_image_path) and not extract_xmind_image(repo_id, real_path)[0]: - error_msg = _(u'Unable to view file') + error_msg = _('Unable to view file') ret_dict['err'] = error_msg else: raw_path = urlquote(SITE_ROOT + get_share_link_thumbnail_src(token, XMIND_IMAGE_SIZE, req_path)) @@ -1499,7 +1499,7 @@ def view_file_via_shared_dir(request, fileshare): template = 'shared_file_view_react.html' file_share_link = request.path - desc_for_ogp = _(u'Share link for %s.') % filename + desc_for_ogp = _('Share link for %s.') % filename icon_path_for_ogp = file_icon_filter(filename, size=192) return render(request, template, { @@ -1518,7 +1518,7 @@ def view_file_via_shared_dir(request, fileshare): 'err': ret_dict['err'], 'file_content': ret_dict['file_content'], 'encoding': ret_dict['encoding'], - 'file_encoding_list':ret_dict['file_encoding_list'], + 'file_encoding_list': ret_dict['file_encoding_list'], 'filetype': ret_dict['filetype'], 'zipped': zipped, 'img_prev': img_prev, @@ -1533,7 +1533,7 @@ def view_file_via_shared_dir(request, fileshare): def file_edit_submit(request, repo_id): content_type = 'application/json; charset=utf-8' - def error_json(error_msg=_(u'Internal Error'), op=None): + def error_json(error_msg=_('Internal Error'), op=None): return HttpResponse(json.dumps({'error': error_msg, 'op': op}), status=400, content_type=content_type) @@ -1545,30 +1545,30 @@ def file_edit_submit(request, repo_id): # edit file, so check parent_dir's permission if parse_repo_perm(check_folder_permission( request, repo_id, parent_dir)).can_edit_on_web is False: - return error_json(_(u'Permission denied')) + return error_json(_('Permission denied')) try: is_locked, locked_by_me = check_file_lock(repo_id, path, username) except Exception as e: logger.error(e) - return error_json(_(u'Internal Server Error')) + return error_json(_('Internal Server Error')) if is_locked and not locked_by_me: - return error_json(_(u'File is locked')) + return error_json(_('File is locked')) repo = get_repo(repo_id) if not repo: - return error_json(_(u'The library does not exist.')) + return error_json(_('The library does not exist.')) if repo.encrypted: repo.password_set = seafile_api.is_password_set(repo_id, username) if not repo.password_set: - return error_json(_(u'The library is encrypted.'), 'decrypt') + return error_json(_('The library is encrypted.'), 'decrypt') content = request.POST.get('content') encoding = request.POST.get('encoding') if content is None or not path or encoding not in FILE_ENCODING_LIST: - return error_json(_(u'Invalid arguments.')) + return error_json(_('Invalid arguments.')) head_id = request.GET.get('head', None) # first dump the file content to a tmp file, then update the file @@ -1586,7 +1586,7 @@ def file_edit_submit(request, repo_id): content = content.encode(encoding) except UnicodeEncodeError: remove_tmp_file() - return error_json(_(u'The encoding you chose is not proper.')) + return error_json(_('The encoding you chose is not proper.')) try: bytesWritten = os.write(fd, content) @@ -1607,16 +1607,16 @@ def file_edit_submit(request, repo_id): gid = 0 wiki_name = os.path.splitext(os.path.basename(path))[0] - next = reverse('group_wiki', args=[gid, wiki_name]) + next_page = reverse('group_wiki', args=[gid, wiki_name]) elif req_from == 'personal_wiki_page_edit' or req_from == 'personal_wiki_page_new': wiki_name = os.path.splitext(os.path.basename(path))[0] - next = reverse('personal_wiki', args=[wiki_name]) + next_page = reverse('personal_wiki', args=[wiki_name]) elif req_from == 'wikis_wiki_page_edit' or req_from == 'wikis_wiki_page_new': wiki_slug = request.GET.get('wiki_slug', '') wiki_page_name = os.path.splitext(os.path.basename(path))[0] - next = reverse('wiki:slug', args=[wiki_slug, wiki_page_name]) + next_page = reverse('wiki:slug', args=[wiki_slug, wiki_page_name]) else: - next = reverse('view_lib_file', args=[repo_id, path]) + next_page = reverse('view_lib_file', args=[repo_id, path]) parent_dir = os.path.dirname(path).encode('utf-8') filename = os.path.basename(path).encode('utf-8') @@ -1624,7 +1624,7 @@ def file_edit_submit(request, repo_id): seafserv_threaded_rpc.put_file(repo_id, tmpfile, parent_dir, filename, username, head_id) remove_tmp_file() - return HttpResponse(json.dumps({'href': next}), + return HttpResponse(json.dumps({'href': next_page}), content_type=content_type) except SearpcError as e: remove_tmp_file() @@ -1643,24 +1643,24 @@ def file_edit(request, repo_id): if path[-1] == '/': path = path[:-1] u_filename = os.path.basename(path) - filename = urllib2.quote(u_filename.encode('utf-8')) + filename = urllib.parse.quote(u_filename.encode('utf-8')) parent_dir = os.path.dirname(path) if parse_repo_perm(check_folder_permission( request, repo.id, parent_dir)).can_edit_on_web is False: - return render_permission_error(request, _(u'Unable to edit file')) + return render_permission_error(request, _('Unable to edit file')) head_id = repo.head_cmmt_id obj_id = get_file_id_by_path(repo_id, path) if not obj_id: - return render_error(request, _(u'The file does not exist.')) + return render_error(request, _('The file does not exist.')) token = seafile_api.get_fileserver_access_token(repo_id, obj_id, 'view', request.user.username) if not token: - return render_error(request, _(u'Unable to view file')) + return render_error(request, _('Unable to view file')) # generate path and link zipped = gen_path_link(path, repo.name) @@ -1686,7 +1686,7 @@ def file_edit(request, repo_id): if encoding and encoding not in FILE_ENCODING_LIST: file_encoding_list.append(encoding) else: - err = _(u'Edit online is not offered for this type of file.') + err = _('Edit online is not offered for this type of file.') # Redirect to different place according to from page when user click # cancel button on file edit page. @@ -1704,18 +1704,18 @@ def file_edit(request, repo_id): cancel_url = reverse('wiki:slug', args=[wiki_slug, wiki_page_name]) return render(request, 'file_edit.html', { - 'repo':repo, - 'u_filename':u_filename, + 'repo': repo, + 'u_filename': u_filename, 'wiki_name': wiki_name, - 'path':path, - 'zipped':zipped, - 'filetype':filetype, - 'fileext':fileext, - 'op':op, - 'err':err, - 'file_content':file_content, + 'path': path, + 'zipped': zipped, + 'filetype': filetype, + 'fileext': fileext, + 'op': op, + 'err': err, + 'file_content': file_content, 'encoding': encoding, - 'file_encoding_list':file_encoding_list, + 'file_encoding_list': file_encoding_list, 'head_id': head_id, 'from': page_from, 'gid': gid, @@ -1773,10 +1773,9 @@ def send_file_access_msg(request, repo, path, access_from): msg = 'file-download-%s\t%s\t%s\t%s\t%s\t%s' % \ (access_from, username, ip, user_agent, repo.id, path) - msg_utf8 = msg.encode('utf-8') try: - send_message('seahub.audit', msg_utf8) + seafile_api.publish_event('seahub.audit', msg) except Exception as e: logger.error("Error when sending file-download-%s message: %s" % (access_from, str(e))) @@ -1809,14 +1808,14 @@ def download_file(request, repo_id, obj_id): obj_id, 'download', username) if not token: - messages.error(request, _(u'Unable to download file')) - next = request.META.get('HTTP_REFERER', settings.SITE_ROOT) - return HttpResponseRedirect(next) + messages.error(request, _('Unable to download file')) + next_page = request.META.get('HTTP_REFERER', settings.SITE_ROOT) + return HttpResponseRedirect(next_page) else: - messages.error(request, _(u'Unable to download file')) - next = request.META.get('HTTP_REFERER', settings.SITE_ROOT) - return HttpResponseRedirect(next) + messages.error(request, _('Unable to download file')) + next_page = request.META.get('HTTP_REFERER', settings.SITE_ROOT) + return HttpResponseRedirect(next_page) path = request.GET.get('p', '') send_file_access_msg(request, repo, path, 'web') # send stats message @@ -1881,8 +1880,6 @@ def text_diff(request, repo_id): if not prev_commit: return render_error('bad commit id') - path = path.encode('utf-8') - current_content, err = get_file_content_by_commit_and_path(request, \ repo_id, current_commit.id, path, file_enc) if err: @@ -1907,7 +1904,7 @@ def text_diff(request, repo_id): referer = request.GET.get('referer', '') return render(request, 'text_diff.html', { - 'u_filename':u_filename, + 'u_filename': u_filename, 'repo': repo, 'path': path, 'zipped': zipped, @@ -1944,8 +1941,8 @@ def _check_office_convert_perm(request, repo_id, path, ret): # Work around for the images embedded in excel files referer = request.META.get('HTTP_REFERER', '') if referer: - token = urlparse.parse_qs( - urlparse.urlparse(referer).query).get('token', [''])[0] + token = urllib.parse.parse_qs( + urllib.parse.urlparse(referer).query).get('token', [''])[0] if token: fileshare = FileShare.objects.get_valid_file_link_by_token(token) if not fileshare or fileshare.repo_id != repo_id: @@ -2027,7 +2024,7 @@ def office_convert_get_page(request, repo_id, commit_id, path, filename, cluster if not _OFFICE_PAGE_PATTERN.match(filename): return HttpResponseForbidden() - path = u'/' + path + path = '/' + path if cluster_internal: file_id = _office_convert_get_file_id_internal(request) else: @@ -2054,26 +2051,26 @@ def file_access(request, repo_id): raise Http404 referer = request.META.get('HTTP_REFERER', None) - next = settings.SITE_ROOT if referer is None else referer + next_page = settings.SITE_ROOT if referer is None else referer repo = get_repo(repo_id) if not repo: messages.error(request, _("Library does not exist")) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) path = request.GET.get('p', None) if not path: messages.error(request, _("Argument missing")) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) if not seafile_api.get_file_id_by_path(repo_id, path): messages.error(request, _("File does not exist")) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) # perm check if check_folder_permission(request, repo_id, path) != 'rw': messages.error(request, _("Permission denied")) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) # Make sure page request is an int. If not, deliver first page. try: diff --git a/seahub/views/repo.py b/seahub/views/repo.py index 027cc54ad3..5148dc54d7 100644 --- a/seahub/views/repo.py +++ b/seahub/views/repo.py @@ -108,7 +108,7 @@ def repo_history_view(request, repo_id): path = get_path_from_request(request) user_perm = check_folder_permission(request, repo.id, '/') if user_perm is None: - return render_error(request, _(u'Permission denied')) + return render_error(request, _('Permission denied')) try: server_crypto = UserOptions.objects.is_server_crypto(username) @@ -164,7 +164,7 @@ def repo_snapshot(request, repo_id): username = request.user.username user_perm = check_folder_permission(request, repo.id, '/') if user_perm is None: - return render_error(request, _(u'Permission denied')) + return render_error(request, _('Permission denied')) try: server_crypto = UserOptions.objects.is_server_crypto(username) @@ -216,7 +216,7 @@ def view_lib_as_wiki(request, repo_id, path): user_perm = check_folder_permission(request, repo.id, '/') if user_perm is None: - return render_error(request, _(u'Permission denied')) + return render_error(request, _('Permission denied')) if user_perm == 'rw': user_can_write = True @@ -269,7 +269,7 @@ def view_shared_dir(request, fileshare): if repo.encrypted or not \ seafile_api.check_permission_by_path(repo_id, '/', username): - return render_error(request, _(u'Permission denied')) + return render_error(request, _('Permission denied')) # Check path still exist, otherwise show error if not seafile_api.get_dir_id_by_path(repo.id, fileshare.path): @@ -324,7 +324,7 @@ def view_shared_dir(request, fileshare): template = 'view_shared_dir_react.html' dir_share_link = request.path - desc_for_ogp = _(u'Share link for %s.') % dir_name + desc_for_ogp = _('Share link for %s.') % dir_name return render(request, template, { 'repo': repo, @@ -374,7 +374,7 @@ def view_shared_upload_link(request, uploadlink): if repo.encrypted or \ seafile_api.check_permission_by_path(repo_id, '/', username) != 'rw': - return render_error(request, _(u'Permission denied')) + return render_error(request, _('Permission denied')) uploadlink.view_cnt = F('view_cnt') + 1 uploadlink.save() diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py index c1aaedc915..dfeab5e933 100644 --- a/seahub/views/sysadmin.py +++ b/seahub/views/sysadmin.py @@ -203,7 +203,7 @@ def sys_statistic_traffic(request): 'link_file_upload', 'link_file_download', ] if order_by not in filters and \ - order_by not in map(lambda x: x + '_desc', filters): + order_by not in [x + '_desc' for x in filters]: order_by = 'link_file_download_desc' if req_type == 'user': @@ -403,17 +403,17 @@ def sys_useradmin_export_excel(request): """ Export all users from database to excel """ - next = request.META.get('HTTP_REFERER', None) - if not next: - next = SITE_ROOT + next_page = request.META.get('HTTP_REFERER', None) + if not next_page: + next_page = SITE_ROOT try: users = ccnet_api.get_emailusers('DB', -1, -1) + \ ccnet_api.get_emailusers('LDAPImport', -1, -1) except Exception as e: logger.error(e) - messages.error(request, _(u'Failed to export Excel')) - return HttpResponseRedirect(next) + messages.error(request, _('Failed to export Excel')) + return HttpResponseRedirect(next_page) if is_pro_version(): is_pro = True @@ -518,8 +518,8 @@ def sys_useradmin_export_excel(request): wb = write_xls('users', head, data_list) if not wb: - messages.error(request, _(u'Failed to export Excel')) - return HttpResponseRedirect(next) + messages.error(request, _('Failed to export Excel')) + return HttpResponseRedirect(next_page) response = HttpResponse(content_type='application/ms-excel') response['Content-Disposition'] = 'attachment; filename=users.xlsx' @@ -724,7 +724,7 @@ def user_info(request, email): ret_corrupted=True) in_repos = seafile_api.get_org_share_in_repo_list(org_id, email, -1, -1) - owned_repos = filter(lambda r: not r.is_virtual, owned_repos) + owned_repos = [r for r in owned_repos if not r.is_virtual] # get user profile profile = Profile.objects.get_profile_by_user(email) @@ -873,19 +873,19 @@ def user_set_quota(request, email): org_id = org[0].org_id org_quota_mb = seafserv_threaded_rpc.get_org_quota(org_id) / get_file_size_unit('MB') if space_quota_mb > org_quota_mb: - result['error'] = _(u'Failed to set quota: maximum quota is %d MB' % \ + result['error'] = _('Failed to set quota: maximum quota is %d MB' % \ org_quota_mb) return HttpResponse(json.dumps(result), status=400, content_type=content_type) else: seafile_api.set_org_user_quota(org_id, email, space_quota) except: - result['error'] = _(u'Failed to set quota: internal server error') + result['error'] = _('Failed to set quota: internal server error') return HttpResponse(json.dumps(result), status=500, content_type=content_type) result['success'] = True return HttpResponse(json.dumps(result), content_type=content_type) else: - result['error'] = str(f.errors.values()[0]) + result['error'] = str(list(f.errors.values())[0]) return HttpResponse(json.dumps(result), status=400, content_type=content_type) @login_required_ajax @@ -905,7 +905,7 @@ def sys_org_set_quota(request, org_id): seafserv_threaded_rpc.set_org_quota(org_id, quota) except SearpcError as e: logger.error(e) - result['error'] = _(u'Failed to set quota: internal server error') + result['error'] = _('Failed to set quota: internal server error') return HttpResponse(json.dumps(result), status=500, content_type=content_type) result['success'] = True @@ -917,18 +917,18 @@ def sys_org_set_quota(request, org_id): def user_remove(request, email): """Remove user""" referer = request.META.get('HTTP_REFERER', None) - next = reverse('sys_useradmin') if referer is None else referer + next_page = reverse('sys_useradmin') if referer is None else referer try: user = User.objects.get(email=email) org = ccnet_api.get_orgs_by_user(user.email) if org: if org[0].creator == user.email: - messages.error(request, _(u'Failed to delete: the user is an organization creator')) - return HttpResponseRedirect(next) + messages.error(request, _('Failed to delete: the user is an organization creator')) + return HttpResponseRedirect(next_page) user.delete() - messages.success(request, _(u'Successfully deleted %s') % user.username) + messages.success(request, _('Successfully deleted %s') % user.username) # send admin operation log signal admin_op_detail = { @@ -938,9 +938,9 @@ def user_remove(request, email): operation=USER_DELETE, detail=admin_op_detail) except User.DoesNotExist: - messages.error(request, _(u'Failed to delete: the user does not exist')) + messages.error(request, _('Failed to delete: the user does not exist')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) @login_required @sys_staff_required @@ -955,12 +955,12 @@ def remove_trial(request, user_or_org): raise Http404 referer = request.META.get('HTTP_REFERER', None) - next = reverse('sys_useradmin') if referer is None else referer + next_page = reverse('sys_useradmin') if referer is None else referer TrialAccount.objects.filter(user_or_org=user_or_org).delete() messages.success(request, _('Successfully remove trial for: %s') % user_or_org) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) # @login_required # @sys_staff_required @@ -988,14 +988,14 @@ def user_remove_admin(request, email): user = User.objects.get(email=email) user.is_staff = False user.save() - messages.success(request, _(u'Successfully revoke the admin permission of %s') % user.username) + messages.success(request, _('Successfully revoke the admin permission of %s') % user.username) except User.DoesNotExist: - messages.error(request, _(u'Failed to revoke admin: the user does not exist')) + messages.error(request, _('Failed to revoke admin: the user does not exist')) referer = request.META.get('HTTP_REFERER', None) - next = reverse('sys_useradmin') if referer is None else referer + next_page = reverse('sys_useradmin') if referer is None else referer - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) # @login_required # @sys_staff_required @@ -1037,7 +1037,7 @@ def email_user_on_activation(user): c = { 'username': user.email, } - send_html_email(_(u'Your account on %s is activated') % get_site_name(), + send_html_email(_('Your account on %s is activated') % get_site_name(), 'sysadmin/user_activation_email.html', c, None, [user.email]) @login_required_ajax @@ -1120,7 +1120,7 @@ def send_user_reset_email(request, email, password): 'email': email, 'password': password, } - send_html_email(_(u'Password has been reset on %s') % get_site_name(), + send_html_email(_('Password has been reset on %s') % get_site_name(), 'sysadmin/user_reset_email.html', c, None, [email]) @login_required @@ -1148,25 +1148,25 @@ def user_reset(request, email): msg = _('Successfully reset password to %(passwd)s, an email has been sent to %(user)s.') % \ {'passwd': new_password, 'user': contact_email} messages.success(request, msg) - except Exception, e: + except Exception as e: logger.error(str(e)) msg = _('Successfully reset password to %(passwd)s, but failed to send email to %(user)s, please check your email configuration.') % \ {'passwd':new_password, 'user': user.email} messages.success(request, msg) else: - messages.success(request, _(u'Successfully reset password to %(passwd)s for user %(user)s.') % \ + messages.success(request, _('Successfully reset password to %(passwd)s for user %(user)s.') % \ {'passwd':new_password,'user': user.email}) else: - messages.success(request, _(u'Successfully reset password to %(passwd)s for user %(user)s. But email notification can not be sent, because Email service is not properly configured.') % \ + messages.success(request, _('Successfully reset password to %(passwd)s for user %(user)s. But email notification can not be sent, because Email service is not properly configured.') % \ {'passwd':new_password,'user': user.email}) except User.DoesNotExist: - msg = _(u'Failed to reset password: user does not exist') + msg = _('Failed to reset password: user does not exist') messages.error(request, msg) referer = request.META.get('HTTP_REFERER', None) - next = reverse('sys_useradmin') if referer is None else referer + next_page = reverse('sys_useradmin') if referer is None else referer - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) def send_user_add_mail(request, email, password): """Send email when add new user.""" @@ -1176,7 +1176,7 @@ def send_user_add_mail(request, email, password): 'email': email, 'password': password, } - send_html_email(_(u'You are invited to join %s') % get_site_name(), + send_html_email(_('You are invited to join %s') % get_site_name(), 'sysadmin/user_add_email.html', c, None, [email]) @login_required_ajax @@ -1209,7 +1209,7 @@ def user_add(request): is_active=True) except User.DoesNotExist as e: logger.error(e) - err_msg = _(u'Fail to add user %s.') % email + err_msg = _('Fail to add user %s.') % email return HttpResponse(json.dumps({'error': err_msg}), status=403, content_type=content_type) # send admin operation log signal @@ -1234,12 +1234,12 @@ def user_add(request): if IS_EMAIL_CONFIGURED: try: send_user_add_mail(request, email, password) - messages.success(request, _(u'Successfully added user %s. An email notification has been sent.') % email) - except Exception, e: + messages.success(request, _('Successfully added user %s. An email notification has been sent.') % email) + except Exception as e: logger.error(str(e)) - messages.success(request, _(u'Successfully added user %s. An error accurs when sending email notification, please check your email configuration.') % email) + messages.success(request, _('Successfully added user %s. An error accurs when sending email notification, please check your email configuration.') % email) else: - messages.success(request, _(u'Successfully added user %s.') % email) + messages.success(request, _('Successfully added user %s.') % email) return HttpResponse(json.dumps({'success': True}), content_type=content_type) else: @@ -1247,18 +1247,18 @@ def user_add(request): if SEND_EMAIL_ON_ADDING_SYSTEM_MEMBER: try: send_user_add_mail(request, email, password) - messages.success(request, _(u'Successfully added user %s. An email notification has been sent.') % email) - except Exception, e: + messages.success(request, _('Successfully added user %s. An email notification has been sent.') % email) + except Exception as e: logger.error(str(e)) - messages.success(request, _(u'Successfully added user %s. An error accurs when sending email notification, please check your email configuration.') % email) + messages.success(request, _('Successfully added user %s. An error accurs when sending email notification, please check your email configuration.') % email) else: - messages.success(request, _(u'Successfully added user %s.') % email) + messages.success(request, _('Successfully added user %s.') % email) else: - messages.success(request, _(u'Successfully added user %s. But email notification can not be sent, because Email service is not properly configured.') % email) + messages.success(request, _('Successfully added user %s. But email notification can not be sent, because Email service is not properly configured.') % email) return HttpResponse(json.dumps({'success': True}), content_type=content_type) else: - return HttpResponse(json.dumps({'error': str(form.errors.values()[0])}), status=400, content_type=content_type) + return HttpResponse(json.dumps({'error': str(list(form.errors.values())[0])}), status=400, content_type=content_type) @login_required @sys_staff_required @@ -1266,16 +1266,16 @@ def sys_group_admin_export_excel(request): """ Export all groups to excel """ - next = request.META.get('HTTP_REFERER', None) - if not next: - next = SITE_ROOT + next_page = request.META.get('HTTP_REFERER', None) + if not next_page: + next_page = SITE_ROOT try: groups = ccnet_threaded_rpc.get_all_groups(-1, -1) except Exception as e: logger.error(e) - messages.error(request, _(u'Failed to export Excel')) - return HttpResponseRedirect(next) + messages.error(request, _('Failed to export Excel')) + return HttpResponseRedirect(next_page) head = [_("Name"), _("Creator"), _("Create At")] data_list = [] @@ -1286,8 +1286,8 @@ def sys_group_admin_export_excel(request): wb = write_xls('groups', head, data_list) if not wb: - messages.error(request, _(u'Failed to export Excel')) - return HttpResponseRedirect(next) + messages.error(request, _('Failed to export Excel')) + return HttpResponseRedirect(next_page) response = HttpResponse(content_type='application/ms-excel') response['Content-Disposition'] = 'attachment; filename=groups.xlsx' @@ -1444,18 +1444,18 @@ def sys_org_rename(request, org_id): raise Http404 referer = request.META.get('HTTP_REFERER', None) - next = reverse('sys_org_admin') if referer is None else referer + next_page = reverse('sys_org_admin') if referer is None else referer new_name = request.POST.get('new_name', None) if new_name: try: ccnet_threaded_rpc.set_org_name(int(org_id), new_name) - messages.success(request, _(u'Success')) + messages.success(request, _('Success')) except Exception as e: logger.error(e) - messages.error(request, _(u'Failed to rename organization')) + messages.error(request, _('Failed to rename organization')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) @login_required @require_POST @@ -1483,11 +1483,11 @@ def sys_org_remove(request, org_id): # remove org ccnet_threaded_rpc.remove_org(org_id) - messages.success(request, _(u'Successfully deleted.')) + messages.success(request, _('Successfully deleted.')) referer = request.META.get('HTTP_REFERER', None) - next = reverse('sys_org_admin') if referer is None else referer - return HttpResponseRedirect(next) + next_page = reverse('sys_org_admin') if referer is None else referer + return HttpResponseRedirect(next_page) @login_required_ajax @sys_staff_required @@ -1507,7 +1507,7 @@ def sys_org_set_member_quota(request, org_id): if member_quota > 0: from seahub_extra.organizations.models import OrgMemberQuota OrgMemberQuota.objects.set_quota(org_id, member_quota) - messages.success(request, _(u'Success')) + messages.success(request, _('Success')) return HttpResponse(json.dumps({'success': True}), status=200, content_type=content_type) else: @@ -1744,7 +1744,7 @@ def sys_publink_remove(request): token = request.POST.get('t') if not token: - result = {'error': _(u"Argument missing")} + result = {'error': _("Argument missing")} return HttpResponse(json.dumps(result), status=400, content_type=content_type) FileShare.objects.filter(token=token).delete() @@ -1762,7 +1762,7 @@ def sys_upload_link_remove(request): token = request.POST.get('t') if not token: - result = {'error': _(u"Argument missing")} + result = {'error': _("Argument missing")} return HttpResponse(json.dumps(result), status=400, content_type=content_type) UploadLinkShare.objects.filter(token=token).delete() @@ -1816,7 +1816,7 @@ def user_search(request): user_emails.append(user.user) # remove duplicate emails - user_emails = {}.fromkeys(user_emails).keys() + user_emails = list({}.fromkeys(user_emails).keys()) users = [] for user_email in user_emails: @@ -1868,13 +1868,13 @@ def user_search(request): def sys_repo_delete(request, repo_id): """Delete a repo. """ - next = request.META.get('HTTP_REFERER', None) - if not next: - next = HASH_URLS['SYS_REPO_ADMIN'] + next_page = request.META.get('HTTP_REFERER', None) + if not next_page: + next_page = HASH_URLS['SYS_REPO_ADMIN'] if get_system_default_repo_id() == repo_id: messages.error(request, _('System library can not be deleted.')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) repo = seafile_api.get_repo(repo_id) if repo: # Handle the case that repo is `None`. @@ -1886,7 +1886,7 @@ def sys_repo_delete(request, repo_id): try: org_id = seafile_api.get_org_id_by_repo_id(repo_id) usernames = get_related_users_by_repo(repo_id, - org_id if org_id > 0 else None) + org_id if org_id and org_id > 0 else None) except Exception as e: logger.error(e) org_id = -1 @@ -1897,8 +1897,8 @@ def sys_repo_delete(request, repo_id): usernames=usernames, repo_owner=repo_owner, repo_id=repo_id, repo_name=repo_name) - messages.success(request, _(u'Successfully deleted.')) - return HttpResponseRedirect(next) + messages.success(request, _('Successfully deleted.')) + return HttpResponseRedirect(next_page) @login_required @sys_staff_required @@ -1990,9 +1990,9 @@ def batch_user_make_admin(request): success.append(email) for item in success: - messages.success(request, _(u'Successfully set %s as admin.') % item) + messages.success(request, _('Successfully set %s as admin.') % item) for item in failed: - messages.error(request, _(u'Failed to set %s as admin: user does not exist.') % item) + messages.error(request, _('Failed to set %s as admin: user does not exist.') % item) return HttpResponse(json.dumps({'success': True,}), content_type=content_type) @@ -2001,13 +2001,13 @@ def batch_user_make_admin(request): def batch_add_user_example(request): """ get example file. """ - next = request.META.get('HTTP_REFERER', None) - if not next: - next = SITE_ROOT + next_page = request.META.get('HTTP_REFERER', None) + if not next_page: + next_page = SITE_ROOT data_list = [] head = [_('Email'), _('Password'), _('Name')+ '(' + _('Optional') + ')', _('Role') + '(' + _('Optional') + ')', _('Space Quota') + '(MB, ' + _('Optional') + ')'] - for i in xrange(5): + for i in range(5): username = "test" + str(i) +"@example.com" password = "123456" name = "test" + str(i) @@ -2017,8 +2017,8 @@ def batch_add_user_example(request): wb = write_xls('sample', head, data_list) if not wb: - messages.error(request, _(u'Failed to export Excel')) - return HttpResponseRedirect(next) + messages.error(request, _('Failed to export Excel')) + return HttpResponseRedirect(next_page) response = HttpResponse(content_type='application/ms-excel') response['Content-Disposition'] = 'attachment; filename=users.xlsx' @@ -2033,14 +2033,14 @@ def batch_add_user(request): if request.method != 'POST': raise Http404 - next = request.META.get('HTTP_REFERER', reverse(sys_user_admin)) + next_page = request.META.get('HTTP_REFERER', reverse(sys_user_admin)) form = BatchAddUserForm(request.POST, request.FILES) if form.is_valid(): content = request.FILES['file'].read() if str(request.FILES['file']).split('.')[-1].lower() != 'xlsx': - messages.error(request, _(u'Please choose a .xlsx file.')) - return HttpResponseRedirect(next) + messages.error(request, _('Please choose a .xlsx file.')) + return HttpResponseRedirect(next_page) try: fs = BytesIO(content) @@ -2048,20 +2048,20 @@ def batch_add_user(request): except Exception as e: logger.error(e) messages.error(request, _('Internal Server Error')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) rows = wb.worksheets[0].rows records = [] # remove first row(head field). - rows.next() + next(rows) for row in rows: # value of email and password is not None if row[0].value and row[1].value: records.append([c.value for c in row]) if user_number_over_limit(new_users=len(records)): - messages.error(request, _(u'The number of users exceeds the limit.')) - return HttpResponseRedirect(next) + messages.error(request, _('The number of users exceeds the limit.')) + return HttpResponseRedirect(next_page) for row in records: try: @@ -2107,7 +2107,7 @@ def batch_add_user(request): send_html_email_with_dj_template( username, dj_template='sysadmin/user_batch_add_email.html', - subject=_(u'You are invited to join %s') % get_site_name(), + subject=_('You are invited to join %s') % get_site_name(), context={ 'user': email2nickname(request.user.username), 'email': username, @@ -2122,9 +2122,9 @@ def batch_add_user(request): operation=USER_ADD, detail=admin_op_detail) messages.success(request, _('Import succeeded')) else: - messages.error(request, _(u'Please choose a .xlsx file.')) + messages.error(request, _('Please choose a .xlsx file.')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) @login_required def sys_sudo_mode(request): @@ -2135,7 +2135,7 @@ def sys_sudo_mode(request): if not request.user.is_staff: raise Http404 - next = request.GET.get('next', reverse('sys_useradmin')) + next_page = request.GET.get('next', reverse('sys_useradmin')) password_error = False if request.method == 'POST': password = request.POST.get('password') @@ -2149,7 +2149,7 @@ def sys_sudo_mode(request): from seahub.auth.utils import clear_login_failed_attempts clear_login_failed_attempts(request, username) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) password_error = True from seahub.auth.utils import get_login_failed_attempts, incr_login_failed_attempts @@ -2168,7 +2168,7 @@ def sys_sudo_mode(request): 'sysadmin/sudo_mode.html', { 'password_error': password_error, 'enable_sso': enable_shib_login or enable_adfs_login, - 'next': next, + 'next': next_page, }) @login_required @@ -2204,23 +2204,23 @@ def sys_settings(request): value = request.POST.get('value', None) if key not in dir(config) or value is None: - result['error'] = _(u'Invalid setting') + result['error'] = _('Invalid setting') return HttpResponse(json.dumps(result), status=400, content_type=content_type) if value.isdigit(): if key in DIGIT_WEB_SETTINGS: value = int(value) else: - result['error'] = _(u'Invalid value') + result['error'] = _('Invalid value') return HttpResponse(json.dumps(result), status=400, content_type=content_type) - if key == 'USER_PASSWORD_STRENGTH_LEVEL' and value not in (1,2,3,4): - result['error'] = _(u'Invalid value') + if key == 'USER_PASSWORD_STRENGTH_LEVEL' and value not in (1, 2, 3, 4): + result['error'] = _('Invalid value') return HttpResponse(json.dumps(result), status=400, content_type=content_type) else: if key not in STRING_WEB_SETTINGS: - result['error'] = _(u'Invalid value') + result['error'] = _('Invalid value') return HttpResponse(json.dumps(result), status=400, content_type=content_type) try: @@ -2229,7 +2229,7 @@ def sys_settings(request): return HttpResponse(json.dumps(result), content_type=content_type) except AttributeError as e: logger.error(e) - result['error'] = _(u'Internal server error') + result['error'] = _('Internal server error') return HttpResponse(json.dumps(result), status=500, content_type=content_type) config_dict = {} @@ -2341,19 +2341,19 @@ def sys_inst_add_user(request, inst_id): try: User.objects.get(email=email) except Exception as e: - messages.error(request, u'Failed to add %s to the institution: user does not exist.' % email) + messages.error(request, 'Failed to add %s to the institution: user does not exist.' % email) continue profile = Profile.objects.get_profile_by_user(email) if not profile: profile = Profile.objects.add_or_update(email, email) if profile.institution: - messages.error(request, _(u"Failed to add %s to the institution: user already belongs to an institution") % email) + messages.error(request, _("Failed to add %s to the institution: user already belongs to an institution") % email) continue else: profile.institution = inst.name profile.save() - messages.success(request, _(u'Successfully added %s to the institution.') % email) + messages.success(request, _('Successfully added %s to the institution.') % email) return HttpResponse(json.dumps({'success': True}), content_type=content_type) @@ -2520,9 +2520,9 @@ def sys_inst_toggle_admin(request, inst_id, email): except Institution.DoesNotExist: raise Http404 - next = request.META.get('HTTP_REFERER', None) - if not next: - next = reverse('sys_inst_info_users', args=[inst.pk]) + next_page = request.META.get('HTTP_REFERER', None) + if not next_page: + next_page = reverse('sys_inst_info_users', args=[inst.pk]) try: u = User.objects.get(email=email) @@ -2532,7 +2532,7 @@ def sys_inst_toggle_admin(request, inst_id, email): if u.is_staff: messages.error( request, 'Can not assign institutional administration roles to global administrators') - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) res = InstitutionAdmin.objects.filter(institution=inst, user=email) if len(res) == 0: @@ -2544,7 +2544,7 @@ def sys_inst_toggle_admin(request, inst_id, email): assert False messages.success(request, _('Success')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) @login_required @sys_staff_required @@ -2556,9 +2556,9 @@ def sys_inst_set_quota(request, inst_id): except Institution.DoesNotExist: raise Http404 - next = request.META.get('HTTP_REFERER', None) - if not next: - next = reverse('sys_inst_info_users', args=[inst.pk]) + next_page = request.META.get('HTTP_REFERER', None) + if not next_page: + next_page = reverse('sys_inst_info_users', args=[inst.pk]) quota_mb = int(request.POST.get('space_quota', '')) quota = quota_mb * get_file_size_unit('MB') @@ -2662,7 +2662,7 @@ def sys_terms_admin(request): content_type=content_type) else: return HttpResponse(json.dumps({ - 'error': str(form.errors.values()[0]) + 'error': str(list(form.errors.values())[0]) }), status=400, content_type=content_type) tc_list = TermsAndConditions.objects.all().order_by('-date_created') diff --git a/seahub/views/wiki.py b/seahub/views/wiki.py index 9db5d8c82c..0ef6ad74ff 100644 --- a/seahub/views/wiki.py +++ b/seahub/views/wiki.py @@ -11,8 +11,8 @@ import logging import json import stat import tempfile -import urllib -import urllib2 +import urllib.request, urllib.parse, urllib.error +import urllib.request, urllib.error, urllib.parse import chardet from django.core.urlresolvers import reverse @@ -53,7 +53,7 @@ def personal_wiki(request, page_name="home"): joined_groups = seaserv.get_personal_groups_by_user(username) if joined_groups: - joined_groups.sort(lambda x, y: cmp(x.group_name.lower(), y.group_name.lower())) + joined_groups.sort(key=lambda x: x.group_name.lower()) wiki_exists = True try: @@ -125,7 +125,7 @@ def personal_wiki_pages(request): joined_groups = seaserv.get_personal_groups_by_user(username) if joined_groups: - joined_groups.sort(lambda x, y: cmp(x.group_name.lower(), y.group_name.lower())) + joined_groups.sort(key=lambda x: x.group_name.lower()) try: repo = get_personal_wiki_repo(username) @@ -161,7 +161,7 @@ def personal_wiki_create(request): form = WikiCreateForm(request.POST) if not form.is_valid(): - return json_error(str(form.errors.values()[0])) + return json_error(str(list(form.errors.values())[0])) # create group repo in user context repo_name = form.cleaned_data['repo_name'] @@ -171,17 +171,17 @@ def personal_wiki_create(request): repo_id = seafile_api.create_repo(repo_name, repo_desc, username) if not repo_id: - return json_error(_(u'Failed to create'), 500) + return json_error(_('Failed to create'), 500) PersonalWiki.objects.save_personal_wiki(username=username, repo_id=repo_id) # create home page page_name = "home.md" if not seaserv.post_empty_file(repo_id, "/", page_name, username): - return json_error(_(u'Failed to create home page. Please retry later'), 500) + return json_error(_('Failed to create home page. Please retry later'), 500) - next = reverse('personal_wiki', args=[]) - return HttpResponse(json.dumps({'href': next}), content_type=content_type) + next_page = reverse('personal_wiki', args=[]) + return HttpResponse(json.dumps({'href': next_page}), content_type=content_type) @login_required def personal_wiki_use_lib(request): @@ -190,15 +190,15 @@ def personal_wiki_use_lib(request): repo_id = request.POST.get('dst_repo', '') username = request.user.username - next = reverse('personal_wiki', args=[]) + next_page = reverse('personal_wiki', args=[]) repo = seafile_api.get_repo(repo_id) if repo is None: messages.error(request, _('Failed to set wiki library.')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) if check_folder_permission(request, repo_id, '/') != 'rw': messages.error(request, _('Permission denied.')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) PersonalWiki.objects.save_personal_wiki(username=username, repo_id=repo_id) @@ -208,7 +208,7 @@ def personal_wiki_use_lib(request): if not seaserv.post_empty_file(repo_id, "/", page_name, username): messages.error(request, _('Failed to create home page. Please retry later')) - return HttpResponseRedirect(next) + return HttpResponseRedirect(next_page) @login_required def personal_wiki_page_new(request, page_name="home"): @@ -250,7 +250,7 @@ def personal_wiki_page_edit(request, page_name="home"): filepath = "/" + page_name + ".md" url = "%s?p=%s&from=personal_wiki_page_edit" % ( reverse('file_edit', args=[repo.id]), - urllib2.quote(filepath.encode('utf-8'))) + urllib.parse.quote(filepath.encode('utf-8'))) return HttpResponseRedirect(url) diff --git a/seahub/wiki/forms.py b/seahub/wiki/forms.py index 71f36a9aa0..538861d514 100644 --- a/seahub/wiki/forms.py +++ b/seahub/wiki/forms.py @@ -6,7 +6,7 @@ from django.conf import settings from django.utils.translation import ugettext_lazy as _ from seahub.utils import is_valid_dirent_name -from utils import clean_page_name +from .utils import clean_page_name class WikiCreateForm(forms.Form): """ @@ -14,18 +14,18 @@ class WikiCreateForm(forms.Form): """ repo_name = forms.CharField(max_length=settings.MAX_FILE_NAME, error_messages={ - 'required': _(u'Name can\'t be empty'), - 'max_length': _(u'Name is too long (maximum is 255 characters)') + 'required': _('Name can\'t be empty'), + 'max_length': _('Name is too long (maximum is 255 characters)') }) repo_desc = forms.CharField(max_length=100, error_messages={ - 'required': _(u'Description can\'t be empty'), - 'max_length': _(u'Description is too long (maximum is 100 characters)') + 'required': _('Description can\'t be empty'), + 'max_length': _('Description is too long (maximum is 100 characters)') }) def clean_repo_name(self): repo_name = self.cleaned_data['repo_name'] if not is_valid_dirent_name(repo_name): - error_msg = _(u'"%s" is not a valid name') % repo_name + error_msg = _('"%s" is not a valid name') % repo_name raise forms.ValidationError(error_msg) else: return repo_name diff --git a/seahub/wiki/management/commands/migrate_group_wiki.py b/seahub/wiki/management/commands/migrate_group_wiki.py index 3a4fcbd462..1a3dcd1e2a 100644 --- a/seahub/wiki/management/commands/migrate_group_wiki.py +++ b/seahub/wiki/management/commands/migrate_group_wiki.py @@ -11,28 +11,28 @@ class Command(BaseCommand): label = "wiki_migrate_group_wiki" def handle(self, *args, **options): - print 'Start to migrate...' + print('Start to migrate...') for r in GroupWiki.objects.all(): repo = seafile_api.get_repo(r.repo_id) if not repo: - print('Repo %s not found. Skip.' % r.repo_id) + print(('Repo %s not found. Skip.' % r.repo_id)) continue owner = seafile_api.get_repo_owner(r.repo_id) if not owner: - print('Owner of repo %s not found. Skip.' % r.repo_id) + print(('Owner of repo %s not found. Skip.' % r.repo_id)) continue wiki_name = 'Group%s-%s' % (r.group_id, repo.name) try: Wiki.objects.add(wiki_name=wiki_name, username=owner, repo_id=r.repo_id) - print('Successfully migrated GroupWiki(%s-%s) to Wiki(%s-%s-%s)' % (r.group_id, r.repo_id, owner, wiki_name, r.repo_id)) + print(('Successfully migrated GroupWiki(%s-%s) to Wiki(%s-%s-%s)' % (r.group_id, r.repo_id, owner, wiki_name, r.repo_id))) except DuplicateWikiNameError: - print 'Multiple group wiki records found, group: %s, repo_id: %s. Skip.' % (r.group_id, r.repo_id) + print('Multiple group wiki records found, group: %s, repo_id: %s. Skip.' % (r.group_id, r.repo_id)) continue except Exception as e: - print e + print(e) continue - print 'Done.' + print('Done.') diff --git a/seahub/wiki/management/commands/migrate_personal_wiki.py b/seahub/wiki/management/commands/migrate_personal_wiki.py index a1802704ae..b34c44acd1 100644 --- a/seahub/wiki/management/commands/migrate_personal_wiki.py +++ b/seahub/wiki/management/commands/migrate_personal_wiki.py @@ -15,13 +15,13 @@ class Command(BaseCommand): label = "wiki_migrate_personal_wiki" def handle(self, *args, **options): - print 'Start to migrate...' + print('Start to migrate...') for r in PersonalWiki.objects.all(): try: Wiki.objects.add(wiki_name=r.username.split('@')[0], username=r.username, repo_id=r.repo_id) except DuplicateWikiNameError: - print 'Multiple personal wiki records found, user: %s, repo_id: %s. Skip.' % (r.username, r.repo_id) + print('Multiple personal wiki records found, user: %s, repo_id: %s. Skip.' % (r.username, r.repo_id)) continue - print 'Done.' + print('Done.') diff --git a/seahub/wiki/migrations/0001_initial.py b/seahub/wiki/migrations/0001_initial.py index e019de4d94..5fbb253bd6 100644 --- a/seahub/wiki/migrations/0001_initial.py +++ b/seahub/wiki/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-21 08:42 -from __future__ import unicode_literals + from django.db import migrations, models import seahub.base.fields diff --git a/seahub/wiki/migrations/0002_auto_20180326_0548.py b/seahub/wiki/migrations/0002_auto_20180326_0548.py index 13d10cb59e..f5988d508c 100644 --- a/seahub/wiki/migrations/0002_auto_20180326_0548.py +++ b/seahub/wiki/migrations/0002_auto_20180326_0548.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models import seahub.base.fields @@ -30,6 +30,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='wiki', - unique_together=set([('username', 'repo_id')]), + unique_together={('username', 'repo_id')}, ), ] diff --git a/seahub/wiki/migrations/0003_auto_20180428_0619.py b/seahub/wiki/migrations/0003_auto_20180428_0619.py index 55b9b9e60e..e6ec161fa1 100644 --- a/seahub/wiki/migrations/0003_auto_20180428_0619.py +++ b/seahub/wiki/migrations/0003_auto_20180428_0619.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-04-28 06:19 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/seahub/wiki/models.py b/seahub/wiki/models.py index 8083076e81..6b0afeb8e4 100644 --- a/seahub/wiki/models.py +++ b/seahub/wiki/models.py @@ -71,7 +71,7 @@ class WikiManager(models.Manager): now = timezone.now() if repo_id is None: # create new repo to store the wiki pages - if org_id > 0: + if org_id and org_id > 0: repo_id = seafile_api.create_org_repo(wiki_name, '', username, org_id) else: repo_id = seafile_api.create_repo(wiki_name, '', username) diff --git a/seahub/wiki/utils.py b/seahub/wiki/utils.py index 76b3599211..d622f40e2e 100644 --- a/seahub/wiki/utils.py +++ b/seahub/wiki/utils.py @@ -3,7 +3,7 @@ import os import re import stat -import urllib2 +import urllib.request, urllib.error, urllib.parse import logging import posixpath @@ -19,7 +19,7 @@ from seahub.utils import gen_file_get_url, get_file_type_and_ext, \ gen_inner_file_get_url, get_site_scheme_and_netloc from seahub.utils.file_types import IMAGE from seahub.utils.timeutils import timestamp_to_isoformat_timestr -from models import WikiPageMissing, WikiDoesNotExist, GroupWiki, PersonalWiki +from .models import WikiPageMissing, WikiDoesNotExist, GroupWiki, PersonalWiki logger = logging.getLogger(__name__) @@ -92,7 +92,7 @@ def get_personal_wiki_page(username, page_name): repo = get_personal_wiki_repo(username) dirent = get_wiki_dirent(repo.id, page_name) url = get_inner_file_url(repo, dirent.obj_id, dirent.obj_name) - file_response = urllib2.urlopen(url) + file_response = urllib.request.urlopen(url) content = file_response.read() return content, repo, dirent @@ -100,7 +100,7 @@ def get_group_wiki_page(username, group, page_name): repo = get_group_wiki_repo(group, username) dirent = get_wiki_dirent(repo.id, page_name) url = get_inner_file_url(repo, dirent.obj_id, dirent.obj_name) - file_response = urllib2.urlopen(url) + file_response = urllib.request.urlopen(url) content = file_response.read() return content, repo, dirent diff --git a/seahub/wiki/views.py b/seahub/wiki/views.py index 710a3901d1..99b5e9fc53 100644 --- a/seahub/wiki/views.py +++ b/seahub/wiki/views.py @@ -1,6 +1,6 @@ # Copyright (c) 2012-2016 Seafile Ltd. import logging -import urllib2 +import urllib.request, urllib.error, urllib.parse import posixpath import seaserv @@ -34,7 +34,7 @@ def wiki_list(request): joined_groups = seaserv.get_personal_groups_by_user(username) if joined_groups: - joined_groups.sort(lambda x, y: cmp(x.group_name.lower(), y.group_name.lower())) + joined_groups.sort(key=lambda x: x.group_name.lower()) return render(request, "wiki/wiki_list.html", { "grps": joined_groups, @@ -70,7 +70,7 @@ def slug(request, slug, file_path="home.md"): return redirect('auth_login') else: if not wiki.has_read_perm(request): - return render_permission_error(request, _(u'Unable to view Wiki')) + return render_permission_error(request, _('Unable to view Wiki')) file_type, ext = get_file_type_and_ext(posixpath.basename(file_path)) if file_type == IMAGE: @@ -134,7 +134,7 @@ def edit_page(request, slug, page_name="home"): filepath = "/" + page_name + ".md" url = "%s?p=%s&from=wikis_wiki_page_edit&wiki_slug=%s" % ( reverse('file_edit', args=[wiki.repo_id]), - urllib2.quote(filepath.encode('utf-8')), + urllib.parse.quote(filepath.encode('utf-8')), slug) return HttpResponseRedirect(url) diff --git a/seahub/wopi/urls.py b/seahub/wopi/urls.py index 4bee246134..ef133427c8 100644 --- a/seahub/wopi/urls.py +++ b/seahub/wopi/urls.py @@ -1,7 +1,7 @@ # Copyright (c) 2012-2016 Seafile Ltd. from django.conf.urls import url -from views import WOPIFilesView, WOPIFilesContentsView +from .views import WOPIFilesView, WOPIFilesContentsView urlpatterns = [ # RESTful API diff --git a/seahub/wopi/utils.py b/seahub/wopi/utils.py index 8191d17755..a393fc5a98 100644 --- a/seahub/wopi/utils.py +++ b/seahub/wopi/utils.py @@ -2,8 +2,8 @@ import os import re import time -import urllib -import urlparse +import urllib.request, urllib.parse, urllib.error +import urllib.parse import requests import hashlib import logging @@ -142,15 +142,15 @@ def get_wopi_dict(request_user, repo_id, file_path, fake_file_id = hashlib.sha1(repo_path_info.encode('utf8')).hexdigest() base_url = get_site_scheme_and_netloc() check_file_info_endpoint = reverse('WOPIFilesView', args=[fake_file_id]) - WOPISrc = urlparse.urljoin(base_url, check_file_info_endpoint) + WOPISrc = urllib.parse.urljoin(base_url, check_file_info_endpoint) query_dict = {'WOPISrc': WOPISrc} if action_url[-1] in ('?', '&'): - full_action_url = action_url + urllib.urlencode(query_dict) + full_action_url = action_url + urllib.parse.urlencode(query_dict) elif '?' in action_url: - full_action_url = action_url + '&' + urllib.urlencode(query_dict) + full_action_url = action_url + '&' + urllib.parse.urlencode(query_dict) else: - full_action_url = action_url + '?' + urllib.urlencode(query_dict) + full_action_url = action_url + '?' + urllib.parse.urlencode(query_dict) # key, collected from seahub/settings.py # value, collected from https://wopi.readthedocs.io/en/latest/faq/languages.html#languages diff --git a/seahub/wopi/views.py b/seahub/wopi/views.py index e8692aad09..9df8bae2f3 100644 --- a/seahub/wopi/views.py +++ b/seahub/wopi/views.py @@ -4,10 +4,10 @@ import os import json import logging -import urllib2 +import urllib.request, urllib.error, urllib.parse import requests import hashlib -import urlparse +import urllib.parse import posixpath import datetime @@ -197,7 +197,7 @@ class WOPIFilesView(APIView): result['IsAnonymousUser'] = True absolute_uri = request.build_absolute_uri('/') - result['PostMessageOrigin'] = urlparse.urljoin(absolute_uri, SITE_ROOT).strip('/') + result['PostMessageOrigin'] = urllib.parse.urljoin(absolute_uri, SITE_ROOT).strip('/') result['HideSaveOption'] = True result['HideExportOption'] = True result['EnableOwnerTermination'] = True @@ -352,8 +352,8 @@ class WOPIFilesContentsView(APIView): inner_path = gen_inner_file_get_url(fileserver_token, file_name) try: - file_content = urllib2.urlopen(inner_path).read() - except urllib2.URLError as e: + file_content = urllib.request.urlopen(inner_path).read() + except urllib.error.URLError as e: logger.error(e) return HttpResponse(json.dumps({}), status=500, content_type=json_content_type) diff --git a/seahub/work_weixin/utils.py b/seahub/work_weixin/utils.py index 0904cdfb1c..235b0de3df 100644 --- a/seahub/work_weixin/utils.py +++ b/seahub/work_weixin/utils.py @@ -19,7 +19,6 @@ logger = logging.getLogger(__name__) WORK_WEIXIN_ACCESS_TOKEN_CACHE_KEY = 'WORK_WEIXIN_ACCESS_TOKEN' -# from social_django.models import UserSocialAuth # get access_token: https://work.weixin.qq.com/api/doc#90000/90135/91039 diff --git a/seahub/work_weixin/views.py b/seahub/work_weixin/views.py index 133fded218..40867781a5 100644 --- a/seahub/work_weixin/views.py +++ b/seahub/work_weixin/views.py @@ -4,7 +4,7 @@ import uuid import logging import requests -import urllib +import urllib.request, urllib.parse, urllib.error from django.http import HttpResponseRedirect from django.utils.translation import ugettext as _ @@ -28,7 +28,6 @@ logger = logging.getLogger(__name__) # # uid = corpid + '_' + userid -# from social_django.models import UserSocialAuth def work_weixin_oauth_login(request): @@ -45,7 +44,7 @@ def work_weixin_oauth_login(request): 'redirect_uri': get_site_scheme_and_netloc() + reverse('work_weixin_oauth_callback'), 'state': state, } - authorization_url = WORK_WEIXIN_AUTHORIZATION_URL + '?' + urllib.urlencode(data) + authorization_url = WORK_WEIXIN_AUTHORIZATION_URL + '?' + urllib.parse.urlencode(data) return HttpResponseRedirect(authorization_url) @@ -147,7 +146,7 @@ def work_weixin_oauth_connect(request): 'redirect_uri': get_site_scheme_and_netloc() + reverse('work_weixin_oauth_connect_callback'), 'state': state, } - authorization_url = WORK_WEIXIN_AUTHORIZATION_URL + '?' + urllib.urlencode(data) + authorization_url = WORK_WEIXIN_AUTHORIZATION_URL + '?' + urllib.parse.urlencode(data) return HttpResponseRedirect(authorization_url) diff --git a/test-requirements.txt b/test-requirements.txt index ef41346d6f..5a79b0bdbe 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,8 @@ -r requirements.txt -mock==1.0.1 -nose==1.3.7 -exam==0.10.5 -splinter==0.7.2 -pytest==3.4.2 -pytest-django==3.1.2 +mock +nose +exam +splinter +pytest +pytest-django diff --git a/tests/api/apitestbase.py b/tests/api/apitestbase.py index 6b3dd553b0..d4503729db 100644 --- a/tests/api/apitestbase.py +++ b/tests/api/apitestbase.py @@ -4,7 +4,7 @@ import requests import unittest from contextlib import contextmanager from nose.tools import assert_equal, assert_in # pylint: disable=E0611 -from urllib import quote +from urllib.parse import quote from tests.common.common import USERNAME, PASSWORD, \ ADMIN_USERNAME, ADMIN_PASSWORD @@ -184,7 +184,7 @@ class ApiTestBase(unittest.TestCase): self.admin_delete(user_url) def create_file(self, repo, fname=None): - if isinstance(repo, basestring): + if isinstance(repo, str): repo = _Repo(repo) fname = fname or ('文件 %s.txt' % randstring()) furl = repo.get_filepath_url('/' + fname) @@ -198,7 +198,7 @@ class ApiTestBase(unittest.TestCase): dpath = '/目录 %s' % randstring() durl = repo.get_dirpath_url(dpath) res = self.post(durl, data=data, expected=201) - self.assertEqual(res.text, u'"success"') + self.assertEqual(res.text, '"success"') return dpath, durl diff --git a/tests/api/endpoints/admin/test_account.py b/tests/api/endpoints/admin/test_account.py index 12a40c97fa..6b942d5eb3 100644 --- a/tests/api/endpoints/admin/test_account.py +++ b/tests/api/endpoints/admin/test_account.py @@ -24,12 +24,12 @@ class AccountTest(BaseTestCase): def _do_create(self): resp = self.client.put( - reverse('api2-account', args=['new_user@test.com']), + reverse('api2-account', args=['new_user_put_create@test.com']), 'password=123456&is_staff=1&is_active=1', 'application/x-www-form-urlencoded', ) # manually remove this account - self.remove_user(email='new_user@test.com') + self.remove_user(email='new_user_put_create@test.com') return resp def _do_get_info(self): diff --git a/tests/api/endpoints/admin/test_device_trusted_ip.py b/tests/api/endpoints/admin/test_device_trusted_ip.py index 302b33a92d..93aac4d8cc 100644 --- a/tests/api/endpoints/admin/test_device_trusted_ip.py +++ b/tests/api/endpoints/admin/test_device_trusted_ip.py @@ -1,4 +1,6 @@ import json +from functools import cmp_to_key + from mock import patch from django.core.urlresolvers import reverse from django.test import override_settings @@ -44,33 +46,33 @@ class DeviceAccessibleIpSetting(BaseTestCase): def test_cmp_ip(self): ip_list = [{'ip': '200.1.1.1'}, {'ip': '192.1.1.1'}, {'ip': '111.1.1.1'}] - new_ip_list = sorted(ip_list, cmp = cmp_ip) + new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip)) assert new_ip_list == ip_list[::-1] ip_list = [{'ip': '192.1.1.1'}, {'ip': '192.*.1.1'}] - new_ip_list = sorted(ip_list, cmp = cmp_ip) + new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip)) assert new_ip_list == ip_list ip_list = [{'ip': '192.*.1.1'}, {'ip': '192.1.1.1'}] - new_ip_list = sorted(ip_list, cmp = cmp_ip) + new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip)) assert new_ip_list == ip_list[::-1] ip_list = [{'ip': '111.1.1.1'}, {'ip': '111.8.1.1'}] - new_ip_list = sorted(ip_list, cmp = cmp_ip) + new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip)) assert new_ip_list == ip_list ip_list = [{'ip': '111.1.*.2'}, {'ip': '111.1.*.1'}] - new_ip_list = sorted(ip_list, cmp = cmp_ip) + new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip)) assert new_ip_list == ip_list[::-1] ip_list = [{'ip': '111.1.*.2'}, {'ip': '111.2.*.1'}, {'ip': '111.1.*.2'}] - new_ip_list = sorted(ip_list, cmp = cmp_ip) + new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip)) assert new_ip_list == [ip_list[0], ip_list[2], ip_list[1]] ip_list = [{'ip': '111.1.*.2'}, {'ip': '112.2.*.1'}, {'ip': '110.1.*.2'}] - new_ip_list = sorted(ip_list, cmp = cmp_ip) + new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip)) assert new_ip_list == [ip_list[2], ip_list[0], ip_list[1]] ip_list = [{'ip': '111.1.*.2'}, {'ip': '111.1.*.*'}, {'ip': '111.*.*.2'}] - new_ip_list = sorted(ip_list, cmp = cmp_ip) + new_ip_list = sorted(ip_list, key=cmp_to_key(cmp_ip)) assert new_ip_list == [ip_list[0], ip_list[1], ip_list[2]] diff --git a/tests/api/endpoints/admin/test_favicon.py b/tests/api/endpoints/admin/test_favicon.py index d641ab721e..a2b498bd41 100644 --- a/tests/api/endpoints/admin/test_favicon.py +++ b/tests/api/endpoints/admin/test_favicon.py @@ -27,7 +27,7 @@ class AdminFaviconTest(BaseTestCase): logo_url = urljoin(BASE_URL, logo_url) logo_file = os.path.join(os.getcwd(), 'media/img/seafile-logo.png') - with open(logo_file) as f: + with open(logo_file, 'rb') as f: resp = self.client.post(logo_url, {'favicon': f}) assert resp.status_code == 200 @@ -45,7 +45,7 @@ class AdminFaviconTest(BaseTestCase): logo_url = urljoin(BASE_URL, logo_url) logo_file = os.path.join(os.getcwd(), 'media/img/seafile-logo.png') - with open(logo_file) as f: + with open(logo_file, 'rb') as f: resp = self.client.post(logo_url, {'favicon': f}) assert resp.status_code == 403 @@ -57,7 +57,7 @@ class AdminFaviconTest(BaseTestCase): logo_url = urljoin(BASE_URL, logo_url) logo_file = os.path.join(os.getcwd(), 'test.noico') - with open(logo_file) as f: + with open(logo_file, 'rb') as f: resp = self.client.post(logo_url, {'favicon': f}) json_resp = json.loads(resp.content) assert resp.status_code == 400 diff --git a/tests/api/endpoints/admin/test_license.py b/tests/api/endpoints/admin/test_license.py index e845c8d9e1..2b40bc6f2b 100644 --- a/tests/api/endpoints/admin/test_license.py +++ b/tests/api/endpoints/admin/test_license.py @@ -22,7 +22,7 @@ class AdminLicenseTest(BaseTestCase): url = reverse('api-v2.1-admin-license') url = urljoin(BASE_URL, url) with open( - os.path.join(os.getcwd(), 'tests/seahub/utils/seafile-license.txt')) as f: + os.path.join(os.getcwd(), 'tests/seahub/utils/seafile-license.txt'), 'rb') as f: resp = self.client.post(url, {'license': f}) json_resp = json.loads(resp.content) @@ -42,7 +42,7 @@ class AdminLicenseTest(BaseTestCase): f.write('1') with open( - os.path.join(os.getcwd(), 'temp.notxt')) as f: + os.path.join(os.getcwd(), 'temp.notxt'), 'rb') as f: resp = self.client.post(url, {'license': f}) json_resp = json.loads(resp.content) assert 400 == resp.status_code diff --git a/tests/api/endpoints/admin/test_organizations.py b/tests/api/endpoints/admin/test_organizations.py index ac0e5f47eb..65d13fc9b6 100644 --- a/tests/api/endpoints/admin/test_organizations.py +++ b/tests/api/endpoints/admin/test_organizations.py @@ -73,14 +73,14 @@ class AdminOrganizationsTest(BaseTestCase): users = json_resp['organizations'] assert len(users) > 0 - assert users[0].has_key('org_id') - assert users[0].has_key('org_name') - assert users[0].has_key('ctime') - assert users[0].has_key('org_url_prefix') - assert users[0].has_key('creator_email') - assert users[0].has_key('creator_name') - assert users[0].has_key('creator_contact_email') - assert users[0].has_key('quota') + assert 'org_id' in users[0] + assert 'org_name' in users[0] + assert 'ctime' in users[0] + assert 'org_url_prefix' in users[0] + assert 'creator_email' in users[0] + assert 'creator_name' in users[0] + assert 'creator_contact_email' in users[0] + assert 'quota' in users[0] def test_can_not_get_orgs_if_not_admin(self): diff --git a/tests/api/endpoints/admin/test_statistics.py b/tests/api/endpoints/admin/test_statistics.py index 5af7afec85..3cb353b7ff 100644 --- a/tests/api/endpoints/admin/test_statistics.py +++ b/tests/api/endpoints/admin/test_statistics.py @@ -18,10 +18,10 @@ class FileOperationsInfoText(BaseTestCase): @patch("seahub.api2.endpoints.admin.statistics.get_file_ops_stats_by_day") def test_can_get_file_audit_stats(self, mock_get_file_audit_stats_by_day, mock_is_pro, mock_events_enabled): mock_get_file_audit_stats_by_day.return_value = [ - (datetime.datetime(2017, 6, 2, 4, 2), u'Added', 2L), - (datetime.datetime(2017, 6, 2, 4, 2), u'Deleted', 2L), - (datetime.datetime(2017, 6, 2, 4, 2), u'Visited', 2L), - (datetime.datetime(2017, 6, 2, 4, 2), u'Modified', 2L), + (datetime.datetime(2017, 6, 2, 4, 2), 'Added', 2), + (datetime.datetime(2017, 6, 2, 4, 2), 'Deleted', 2), + (datetime.datetime(2017, 6, 2, 4, 2), 'Visited', 2), + (datetime.datetime(2017, 6, 2, 4, 2), 'Modified', 2), ] mock_is_pro.return_value = True mock_events_enabled = True @@ -39,7 +39,7 @@ class FileOperationsInfoText(BaseTestCase): @patch("seahub.api2.endpoints.admin.statistics.get_user_activity_stats_by_day") def test_can_user_activity_stats(self, mock_stats_by_day, mock_is_pro, mock_events_enabled): - mock_stats_by_day.return_value = [(datetime.datetime(2017, 6, 2, 4, 0), 3L)] + mock_stats_by_day.return_value = [(datetime.datetime(2017, 6, 2, 4, 0), 3)] mock_is_pro.return_value = True mock_events_enabled = True url = reverse('api-v2.1-admin-statistics-active-users') @@ -56,7 +56,7 @@ class FileOperationsInfoText(BaseTestCase): @patch("seahub.api2.endpoints.admin.statistics.get_total_storage_stats_by_day") def test_can_get_total_storage_stats(self, mock_stats_by_day, mock_is_pro, mock_events_enabled): - mock_stats_by_day.return_value = [(datetime.datetime(2017, 6, 2, 3, 0), 13L)] + mock_stats_by_day.return_value = [(datetime.datetime(2017, 6, 2, 3, 0), 13)] mock_is_pro.return_value = True mock_events_enabled = True url = reverse('api-v2.1-admin-statistics-total-storage') @@ -72,8 +72,8 @@ class FileOperationsInfoText(BaseTestCase): @patch("seahub.api2.endpoints.admin.statistics.get_system_traffic_by_day") def test_can_get_system_traffic(self, mock_get_system_traffic_by_day, mock_is_pro, mock_events_enabled): mock_get_system_traffic_by_day.return_value = [ - (datetime.datetime(2018, 8, 23, 0, 0), u'sync-file-download', 131793L), - (datetime.datetime(2018, 8, 23, 0, 0), u'web-file-download', 13L), + (datetime.datetime(2018, 8, 23, 0, 0), 'sync-file-download', 131793), + (datetime.datetime(2018, 8, 23, 0, 0), 'web-file-download', 13), ] mock_is_pro.return_value = True mock_events_enabled = True diff --git a/tests/api/endpoints/admin/test_users.py b/tests/api/endpoints/admin/test_users.py index 9d87f1c7ce..3a3a56f97d 100644 --- a/tests/api/endpoints/admin/test_users.py +++ b/tests/api/endpoints/admin/test_users.py @@ -36,16 +36,16 @@ class AdminUsersTest(BaseTestCase): assert json_resp['total_count'] > 0 assert len(json_resp['data']) == json_resp['total_count'] - assert json_resp['data'][0].has_key('email') - assert json_resp['data'][0].has_key('name') - assert json_resp['data'][0].has_key('contact_email') - assert json_resp['data'][0].has_key('is_staff') - assert json_resp['data'][0].has_key('is_active') - assert json_resp['data'][0].has_key('create_time') - assert json_resp['data'][0].has_key('department') - assert json_resp['data'][0].has_key('quota_total') - assert json_resp['data'][0].has_key('quota_usage') - assert json_resp['data'][0].has_key('create_time') + assert 'email' in json_resp['data'][0] + assert 'name' in json_resp['data'][0] + assert 'contact_email' in json_resp['data'][0] + assert 'is_staff' in json_resp['data'][0] + assert 'is_active' in json_resp['data'][0] + assert 'create_time' in json_resp['data'][0] + assert 'department' in json_resp['data'][0] + assert 'quota_total' in json_resp['data'][0] + assert 'quota_usage' in json_resp['data'][0] + assert 'create_time' in json_resp['data'][0] def test_get_with_invalid_user_permission(self): self.login_as(self.user) @@ -119,15 +119,15 @@ class AdminUserTest(BaseTestCase): assert json_resp['email'] == self.tmp_email - assert json_resp.has_key('email') - assert json_resp.has_key('name') - assert json_resp.has_key('contact_email') - assert json_resp.has_key('is_staff') - assert json_resp.has_key('is_active') - assert json_resp.has_key('create_time') - assert json_resp.has_key('department') - assert json_resp.has_key('quota_total') - assert json_resp.has_key('quota_usage') + assert 'email' in json_resp + assert 'name' in json_resp + assert 'contact_email' in json_resp + assert 'is_staff' in json_resp + assert 'is_active' in json_resp + assert 'create_time' in json_resp + assert 'department' in json_resp + assert 'quota_total' in json_resp + assert 'quota_usage' in json_resp def test_get_with_invalid_user_permission(self): self.login_as(self.user) diff --git a/tests/api/endpoints/test_dir_view.py b/tests/api/endpoints/test_dir_view.py index a868597d24..3856eb25a4 100644 --- a/tests/api/endpoints/test_dir_view.py +++ b/tests/api/endpoints/test_dir_view.py @@ -34,7 +34,7 @@ class DirViewTest(BaseTestCase): if len(json_resp['dirent_list']) > 0: for dirent in json_resp['dirent_list']: - if dirent.has_key('is_dir') and dirent['is_dir']: + if 'is_dir' in dirent and dirent['is_dir']: return dirent['obj_name'] else: continue @@ -222,7 +222,7 @@ class DirViewTest(BaseTestCase): assert len(json_resp['dirent_list']) == 1 assert json_resp['dirent_list'][0]['type'] == 'file' assert json_resp['dirent_list'][0]['name'] == self.file_name - assert not json_resp['dirent_list'][0].has_key('file_tags') + assert 'file_tags' not in json_resp['dirent_list'][0] # add file tag tag_name = randstring(6) @@ -261,7 +261,7 @@ class DirViewTest(BaseTestCase): assert len(json_resp['dirent_list']) == 1 assert json_resp['dirent_list'][0]['type'] == 'file' assert json_resp['dirent_list'][0]['name'] == image_file_name - assert not json_resp['dirent_list'][0].has_key('encoded_thumbnail_src') + assert 'encoded_thumbnail_src' not in json_resp['dirent_list'][0] file_id = json_resp['dirent_list'][0]['id'] diff --git a/tests/api/endpoints/test_file_comments.py b/tests/api/endpoints/test_file_comments.py index 863626b4f8..c07dad3ebb 100644 --- a/tests/api/endpoints/test_file_comments.py +++ b/tests/api/endpoints/test_file_comments.py @@ -22,7 +22,7 @@ class FileCommentsTest(BaseTestCase): self.remove_user(self.tmp_user.email) def test_can_list(self): - for i in xrange(10): + for i in range(10): o = FileComment.objects.add_by_file_path(repo_id=self.repo.id, file_path=self.file, author=self.tmp_user.username, @@ -33,7 +33,7 @@ class FileCommentsTest(BaseTestCase): json_resp = json.loads(resp.content) assert len(resp._headers.get('links')) == 2 assert resp._headers.get('links')[0] == 'Links' - link = reverse('api2-file-comments', args=[self.repo.id]) + '?per_page=5&page=1' + link = reverse('api2-file-comments', args=[self.repo.id]) + '?page=1&per_page=5' assert link in resp._headers.get('links')[1] assert len(json_resp['comments']) == 5 assert json_resp['comments'][0]['comment'] == 'test comment5' diff --git a/tests/api/endpoints/test_file_comments_counts.py b/tests/api/endpoints/test_file_comments_counts.py index 5b58094309..ba3223492d 100644 --- a/tests/api/endpoints/test_file_comments_counts.py +++ b/tests/api/endpoints/test_file_comments_counts.py @@ -39,10 +39,10 @@ class FileCommentsCountsTest(BaseTestCase): json_resp = json.loads(resp.content) assert len(json_resp) == 2 for d in json_resp: - if d.keys()[0] == 'test.txt': + if list(d.keys())[0] == 'test.txt': assert d['test.txt'] == 2 - if d.keys()[0] == 'test2.txt': + if list(d.keys())[0] == 'test2.txt': assert d['test2.txt'] == 1 # def test_can_get_file(self): diff --git a/tests/api/endpoints/test_file_tag.py b/tests/api/endpoints/test_file_tag.py index 0219cad35f..04e4d58acc 100644 --- a/tests/api/endpoints/test_file_tag.py +++ b/tests/api/endpoints/test_file_tag.py @@ -117,7 +117,7 @@ class FileTagTest(BaseTestCase): tags_names = [tags["name"] for tags in response.data["tags"]] assert "test_tagname" in tags_names assert "test_tagname1" in tags_names - assert "test_tagnm天".decode('utf-8') in tags_names + assert "test_tagnm天" in tags_names assert response.data["tags"][0]["creator"] == self.user.username response = self.client.get(self.endpoint, { 'path': self.test_filepath, @@ -126,10 +126,10 @@ class FileTagTest(BaseTestCase): tags_names = [tags["name"] for tags in response.data["tags"]] assert "test_tagname" in tags_names assert "test_tagname1" in tags_names - assert "test_tagnm天".decode('utf-8') in tags_names + assert "test_tagnm天" in tags_names #test delete all filetag and add specifiy tag data = 'names=test_zm-.&path=%s&is_dir=%s' % (self.test_filepath, False) - response = self.client.put(self.endpoint, data,'application/x-www-form-urlencoded') + response = self.client.put(self.endpoint, data, 'application/x-www-form-urlencoded') assert response.status_code == 200 response = self.client.get(self.endpoint, { 'path': self.test_filepath, 'is_dir': False, @@ -141,7 +141,7 @@ class FileTagTest(BaseTestCase): assert "test_zm-." in tags_names #delete delete all filetag data = 'names=&path=%s&is_dir=%s' % (self.test_filepath, False) - response = self.client.put(self.endpoint, data,'application/x-www-form-urlencoded') + response = self.client.put(self.endpoint, data, 'application/x-www-form-urlencoded') tags_names = [tags["name"] for tags in response.data["tags"]] assert response.status_code == 200 assert "test_zm" not in tags_names diff --git a/tests/api/endpoints/test_file_view.py b/tests/api/endpoints/test_file_view.py index 94fe9bcfe9..f42f7d2ad5 100644 --- a/tests/api/endpoints/test_file_view.py +++ b/tests/api/endpoints/test_file_view.py @@ -41,7 +41,7 @@ class FileViewTest(BaseTestCase): if len(json_resp['dirent_list']) > 0: for dirent in json_resp['dirent_list']: - if dirent.has_key('is_file') and dirent['is_file']: + if 'is_file' in dirent and dirent['is_file']: return dirent['obj_name'] else: continue diff --git a/tests/api/endpoints/test_groups.py b/tests/api/endpoints/test_groups.py index ae803e634c..996ea170ac 100644 --- a/tests/api/endpoints/test_groups.py +++ b/tests/api/endpoints/test_groups.py @@ -76,7 +76,7 @@ class GroupsTest(BaseTestCase): self.remove_group(json_resp['id']) def test_create_group_with_cn_name(self): - new_group_name = u'中文' + randstring(6) + new_group_name = '中文' + randstring(6) resp = self.client.post(self.url, {'name': new_group_name}) self.assertEqual(201, resp.status_code) diff --git a/tests/api/endpoints/test_invitations.py b/tests/api/endpoints/test_invitations.py index 00a6a44335..6f9b4712c5 100644 --- a/tests/api/endpoints/test_invitations.py +++ b/tests/api/endpoints/test_invitations.py @@ -95,7 +95,7 @@ class InvitationsTest(BaseTestCase): json_resp = json.loads(resp.content) self.assertEqual(len(Email.objects.all()), 1) - self.assertRegexpMatches(Email.objects.all()[0].html_message, + self.assertRegex(Email.objects.all()[0].html_message, json_resp['token']) assert Email.objects.all()[0].status == 0 @@ -210,9 +210,9 @@ class BatchInvitationsTest(BaseTestCase): json_resp = json.loads(resp.content) self.assertEqual(len(Email.objects.all()), 2) - self.assertRegexpMatches(Email.objects.all()[0].html_message, + self.assertRegex(Email.objects.all()[0].html_message, json_resp['success'][0]['token']) - self.assertRegexpMatches(Email.objects.all()[1].html_message, + self.assertRegex(Email.objects.all()[1].html_message, json_resp['success'][1]['token']) assert Email.objects.all()[0].status == 0 assert Email.objects.all()[1].status == 0 diff --git a/tests/api/endpoints/test_repos_batch.py b/tests/api/endpoints/test_repos_batch.py index f0232fc00c..21df976621 100644 --- a/tests/api/endpoints/test_repos_batch.py +++ b/tests/api/endpoints/test_repos_batch.py @@ -457,7 +457,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', @@ -494,7 +494,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -503,7 +503,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -522,7 +522,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_parent_dir": '/', } resp = self.client.post(self.url, json.dumps(data), 'application/json') @@ -531,7 +531,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, } resp = self.client.post(self.url, json.dumps(data), 'application/json') @@ -545,7 +545,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": invalid_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -556,7 +556,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": invalid_repo_id, "dst_parent_dir": '/', } @@ -570,7 +570,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": 'invalid_folder', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -580,7 +580,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": 'invalid_folder', } @@ -596,7 +596,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": tmp_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -606,7 +606,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": tmp_repo_id, "dst_parent_dir": '/', } @@ -627,7 +627,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.src_repo_id, "dst_parent_dir": '/', } @@ -642,7 +642,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.src_repo_id, "dst_parent_dir": '/', } @@ -661,7 +661,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -679,7 +679,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -694,7 +694,7 @@ class ReposAsyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -737,7 +737,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', @@ -774,7 +774,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -783,7 +783,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -802,7 +802,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_parent_dir": '/', } resp = self.client.post(self.url, json.dumps(data), 'application/json') @@ -811,7 +811,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, } resp = self.client.post(self.url, json.dumps(data), 'application/json') @@ -825,7 +825,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": invalid_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -836,7 +836,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": invalid_repo_id, "dst_parent_dir": '/', } @@ -850,7 +850,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": 'invalid_folder', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -860,7 +860,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": 'invalid_folder', } @@ -876,7 +876,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": tmp_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -886,7 +886,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": tmp_repo_id, "dst_parent_dir": '/', } @@ -904,7 +904,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.src_repo_id, "dst_parent_dir": '/', } @@ -922,7 +922,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.src_repo_id, "dst_parent_dir": '/', } @@ -937,7 +937,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.src_repo_id, "dst_parent_dir": '/', } @@ -956,7 +956,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -973,7 +973,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -987,7 +987,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -1016,7 +1016,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[admin_file_name], + "src_dirents": [admin_file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1047,7 +1047,7 @@ class ReposAsyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[admin_folder_name], + "src_dirents": [admin_folder_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1091,7 +1091,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', @@ -1115,7 +1115,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1124,7 +1124,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1143,7 +1143,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_parent_dir": '/', } resp = self.client.post(self.url, json.dumps(data), 'application/json') @@ -1152,7 +1152,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, } resp = self.client.post(self.url, json.dumps(data), 'application/json') @@ -1166,7 +1166,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": invalid_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1177,7 +1177,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": invalid_repo_id, "dst_parent_dir": '/', } @@ -1191,7 +1191,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": 'invalid_folder', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1201,7 +1201,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": 'invalid_folder', } @@ -1217,7 +1217,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": tmp_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1227,7 +1227,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": tmp_repo_id, "dst_parent_dir": '/', } @@ -1248,7 +1248,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.src_repo_id, "dst_parent_dir": '/', } @@ -1263,7 +1263,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.src_repo_id, "dst_parent_dir": '/', } @@ -1282,7 +1282,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -1300,7 +1300,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -1315,7 +1315,7 @@ class ReposSyncBatchCopyItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -1358,7 +1358,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', @@ -1382,7 +1382,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1391,7 +1391,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1410,7 +1410,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_parent_dir": '/', } resp = self.client.post(self.url, json.dumps(data), 'application/json') @@ -1419,7 +1419,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, } resp = self.client.post(self.url, json.dumps(data), 'application/json') @@ -1433,7 +1433,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": invalid_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1444,7 +1444,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": invalid_repo_id, "dst_parent_dir": '/', } @@ -1458,7 +1458,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": 'invalid_folder', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1468,7 +1468,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": 'invalid_folder', } @@ -1484,7 +1484,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": tmp_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1494,7 +1494,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": tmp_repo_id, "dst_parent_dir": '/', } @@ -1512,7 +1512,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.src_repo_id, "dst_parent_dir": '/', } @@ -1530,7 +1530,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.src_repo_id, "dst_parent_dir": '/', } @@ -1545,7 +1545,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": self.src_repo_id, "dst_parent_dir": '/', } @@ -1564,7 +1564,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -1581,7 +1581,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -1595,7 +1595,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": self.src_repo_id, "src_parent_dir": '/', - "src_dirents":[self.folder_name, self.file_name], + "src_dirents": [self.folder_name, self.file_name], "dst_repo_id": admin_repo_id, "dst_parent_dir": '/', } @@ -1624,7 +1624,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[admin_file_name], + "src_dirents": [admin_file_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1655,7 +1655,7 @@ class ReposSyncBatchMoveItemView(BaseTestCase): data = { "src_repo_id": admin_repo_id, "src_parent_dir": '/', - "src_dirents":[admin_folder_name], + "src_dirents": [admin_folder_name], "dst_repo_id": self.dst_repo_id, "dst_parent_dir": '/', } @@ -1700,7 +1700,7 @@ class ReposBatchDeleteItemView(BaseTestCase): data = { "repo_id": self.repo_id, "parent_dir": '/', - "dirents":[self.folder_name, self.file_name], + "dirents": [self.folder_name, self.file_name], } resp = self.client.delete(self.url, json.dumps(data), @@ -1717,14 +1717,14 @@ class ReposBatchDeleteItemView(BaseTestCase): data = { "parent_dir": '/', - "dirents":[self.folder_name, self.file_name], + "dirents": [self.folder_name, self.file_name], } resp = self.client.delete(self.url, json.dumps(data), 'application/json') self.assertEqual(400, resp.status_code) data = { "repo_id": self.repo_id, - "dirents":[self.folder_name, self.file_name], + "dirents": [self.folder_name, self.file_name], } resp = self.client.delete(self.url, json.dumps(data), 'application/json') self.assertEqual(400, resp.status_code) @@ -1744,7 +1744,7 @@ class ReposBatchDeleteItemView(BaseTestCase): data = { "repo_id": invalid_repo_id, "parent_dir": '/', - "dirents":[self.folder_name, self.file_name], + "dirents": [self.folder_name, self.file_name], } resp = self.client.delete(self.url, json.dumps(data), 'application/json') self.assertEqual(404, resp.status_code) @@ -1756,7 +1756,7 @@ class ReposBatchDeleteItemView(BaseTestCase): data = { "repo_id": self.repo_id, "parent_dir": 'invalid_folder', - "dirents":[self.folder_name, self.file_name], + "dirents": [self.folder_name, self.file_name], } resp = self.client.delete(self.url, json.dumps(data), 'application/json') self.assertEqual(404, resp.status_code) @@ -1770,7 +1770,7 @@ class ReposBatchDeleteItemView(BaseTestCase): data = { "repo_id": tmp_repo_id, "parent_dir": '/', - "dirents":[self.folder_name, self.file_name], + "dirents": [self.folder_name, self.file_name], } resp = self.client.delete(self.url, json.dumps(data), 'application/json') self.assertEqual(403, resp.status_code) @@ -1786,7 +1786,7 @@ class ReposBatchDeleteItemView(BaseTestCase): data = { "repo_id": admin_repo_id, "parent_dir": '/', - "dirents":[self.folder_name, self.file_name], + "dirents": [self.folder_name, self.file_name], } resp = self.client.delete(self.url, json.dumps(data), 'application/json') self.assertEqual(403, resp.status_code) @@ -1814,7 +1814,7 @@ class ReposBatchDeleteItemView(BaseTestCase): data = { "repo_id": admin_repo_id, "parent_dir": '/', - "dirents":[admin_file_name], + "dirents": [admin_file_name], } resp = self.client.delete(self.url, json.dumps(data), 'application/json') self.assertEqual(403, resp.status_code) @@ -1843,7 +1843,7 @@ class ReposBatchDeleteItemView(BaseTestCase): data = { "repo_id": admin_repo_id, "parent_dir": '/', - "dirents":[admin_folder_name], + "dirents": [admin_folder_name], } resp = self.client.delete(self.url, json.dumps(data), 'application/json') self.assertEqual(403, resp.status_code) diff --git a/tests/api/endpoints/test_user.py b/tests/api/endpoints/test_user.py index 186825ecfd..ab63ee5172 100644 --- a/tests/api/endpoints/test_user.py +++ b/tests/api/endpoints/test_user.py @@ -20,13 +20,13 @@ def generate_random_parammeter(min_len, max_len, param_type): return random_nickname, random_nickname_length elif param_type == 'telephone': - random_telephone_length = random.randint(min_len,max_len) + random_telephone_length = random.randint(min_len, max_len) random_telephone = ''.join(random.choice(string.digits) for _ in range(random_telephone_length)) return random_telephone, random_telephone_length elif param_type == 'contact_email': - random_pre_length = random.randint(1,50) - random_post_length = random.randint(1,20) + random_pre_length = random.randint(1, 50) + random_post_length = random.randint(1, 20) random_contact_email = ''.join(random.choice(string.digits + string.ascii_letters) for _ in range(random_pre_length))\ + '@' \ + ''.join(random.choice(string.digits + string.ascii_letters) for _ in range(random_pre_length))\ @@ -34,7 +34,7 @@ def generate_random_parammeter(min_len, max_len, param_type): return random_contact_email elif param_type == 'contact_email_invalid': - random_contact_email_length = random.randint(1,100) + random_contact_email_length = random.randint(1, 100) random_contact_email = ''.join(random.choice(string.digits + string.ascii_letters) for _ in range(random_contact_email_length)) return random_contact_email @@ -56,7 +56,7 @@ class AccountTest(BaseTestCase): self.login_as(self.user) - random_login_id = generate_random_parammeter(0,0,'login_id') + random_login_id = generate_random_parammeter(0, 0, 'login_id') random_telephone, _ = generate_random_parammeter(1, 100, 'telephone') Profile.objects.add_or_update( @@ -77,7 +77,7 @@ class AccountTest(BaseTestCase): assert json_resp['contact_email'] == email2contact_email(self.user_name) assert json_resp['telephone'] == d_profile.telephone assert json_resp['login_id'] == profile.login_id - assert json_resp.has_key('list_in_address_book') + assert 'list_in_address_book' in json_resp def test_update_user_nickname(self): @@ -107,7 +107,7 @@ class AccountTest(BaseTestCase): self.login_as(self.user) Profile.objects.add_or_update(self.user_name) - DetailedProfile.objects.add_or_update(self.user_name, department='' ,telephone='') + DetailedProfile.objects.add_or_update(self.user_name, department='', telephone='') # test can successfully change telephone random_telephone, _ = generate_random_parammeter(1, 100, 'telephone') diff --git a/tests/api/endpoints/test_user_avatar.py b/tests/api/endpoints/test_user_avatar.py index ce605bd605..3a37d6d2eb 100644 --- a/tests/api/endpoints/test_user_avatar.py +++ b/tests/api/endpoints/test_user_avatar.py @@ -15,12 +15,12 @@ class AvatarApiTest(ApiTestBase): avatar_url = urljoin(BASE_URL, avatar_url) avatar_file = os.path.join(os.getcwd(), 'media/img/seafile-logo.png') - random_avatar_size = random.randint(12,128) + random_avatar_size = random.randint(12, 128) - with open(avatar_file) as f: + with open(avatar_file, 'rb') as f: json_resp = self.post(avatar_url, files={'avatar': f}, data={'avatar_size': random_avatar_size}).json() - assert json_resp.has_key('avatar_url') + assert 'avatar_url' in json_resp response_url = json_resp['avatar_url'] list_url = response_url.split('/') assert str(random_avatar_size) in list_url diff --git a/tests/api/endpoints/test_wikis.py b/tests/api/endpoints/test_wikis.py index 249f5783a0..a8f420f401 100644 --- a/tests/api/endpoints/test_wikis.py +++ b/tests/api/endpoints/test_wikis.py @@ -45,7 +45,7 @@ class WikisViewTest(BaseTestCase): assert json_resp['data'][0]['name'] == wiki.name assert 'published/test-wiki' in json_resp['data'][0]['link'] assert json_resp['data'][0]['owner'] == self.user.username - print json_resp['data'][0]['created_at'] + print(json_resp['data'][0]['created_at']) assert json_resp['data'][0]['created_at'] is not None def test_can_list_others(self): diff --git a/tests/api/test_accounts.py b/tests/api/test_accounts.py index 89da324db8..6064cb1279 100644 --- a/tests/api/test_accounts.py +++ b/tests/api/test_accounts.py @@ -16,7 +16,7 @@ class AccountsApiTest(ApiTestBase): # Normal user can not list accounts self.get(ACCOUNTS_URL, expected=403) accounts = self.admin_get(ACCOUNTS_URL).json() - self.assertGreaterEqual(accounts, 2) + self.assertGreaterEqual(len(accounts), 2) # TODO: check returned json, test start/limit param def test_create_delete_account(self): @@ -106,11 +106,11 @@ class AccountsApiTest(ApiTestBase): def test_auth_ping(self): res = self.get(AUTH_PING_URL) - self.assertRegexpMatches(res.text, u'"pong"') + self.assertRegex(res.text, '"pong"') res = requests.get(AUTH_PING_URL) self.assertEqual(res.status_code, 403) def test_ping(self): res = requests.get(PING_URL) - self.assertRegexpMatches(res.text, u'"pong"') + self.assertRegex(res.text, '"pong"') self.assertEqual(res.status_code, 200) diff --git a/tests/api/test_beshared.py b/tests/api/test_beshared.py index 6362f1d3b2..3d25a149b3 100644 --- a/tests/api/test_beshared.py +++ b/tests/api/test_beshared.py @@ -67,5 +67,11 @@ class BeSharedReposTest(BaseTestCase): resp = self.client.get('/api2/beshared-repos/') self.assertEqual(200, resp.status_code) json_resp = json.loads(resp.content) - assert json_resp[0]['repo_id'] == self.sub_repo_id - assert json_resp[0]['share_type'] == 'public' + # assert json_resp[0]['repo_id'] == self.sub_repo_id + # assert json_resp[0]['share_type'] == 'public' + public_repo_success = False + for repo_info in json_resp: + if repo_info['repo_id'] == self.sub_repo_id and \ + repo_info['share_type'] == 'public': + public_repo_success = True + assert public_repo_success diff --git a/tests/api/test_devices.py b/tests/api/test_devices.py index 141d9511e7..0f74dee705 100644 --- a/tests/api/test_devices.py +++ b/tests/api/test_devices.py @@ -12,7 +12,7 @@ class DevicesTest(BaseTestCase, Fixtures): self.platform = 'android' self.device_id = '4a0d62c1f27b3b74' TokenV2.objects.get_or_create_token(self.user.username, self.platform, - self.device_id, u'PLK-AL10', u'2.0.3', u'5.0.2', '192.168.1.208') + self.device_id, 'PLK-AL10', '2.0.3', '5.0.2', '192.168.1.208') def tearDown(self): self.remove_repo() diff --git a/tests/api/test_file_ops.py b/tests/api/test_file_ops.py index df24512333..27ddc31bd4 100644 --- a/tests/api/test_file_ops.py +++ b/tests/api/test_file_ops.py @@ -33,7 +33,7 @@ class FileOpsApiTest(BaseTestCase): return dirent_name_list def create_new_file(self, parent_dir='/'): - new_file_name = u'%s-中文' % randstring(6) + new_file_name = '%s-中文' % randstring(6) seafile_api.post_empty_file(self.repo_id, parent_dir, new_file_name, self.user_name) diff --git a/tests/api/test_files.py b/tests/api/test_files.py index 0dd5672358..e4d96215b5 100644 --- a/tests/api/test_files.py +++ b/tests/api/test_files.py @@ -5,9 +5,9 @@ Test file/dir operations. import posixpath import pytest -import urllib -from urllib import urlencode, quote -import urlparse +import urllib.request, urllib.parse, urllib.error +from urllib.parse import urlencode, quote +import urllib.parse from nose.tools import assert_in from tests.common.utils import randstring, urljoin @@ -23,7 +23,7 @@ class FilesApiTest(ApiTestBase): 'newname': name + randstring(), } res = self.post(furl, data=data) - self.assertRegexpMatches(res.text, r'"http(.*)"') + self.assertRegex(res.text, r'"http(.*)"') def test_remove_file(self): with self.get_tmp_repo() as repo: @@ -51,13 +51,13 @@ class FilesApiTest(ApiTestBase): 'dst_dir': '/', 'operation': 'copy', } - u = urlparse.urlparse(furl) - parsed_furl = urlparse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) + u = urllib.parse.urlparse(furl) + parsed_furl = urllib.parse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) res = self.post(parsed_furl+ '?p=' + quote(file_path), data=data) assert_in(tmp_file, res.text) # get info of copied file in dst dir('/') - fdurl = repo.file_url + u'detail/?p=/%s' % quote(tmp_file) + fdurl = repo.file_url + 'detail/?p=/%s' % quote(tmp_file) detail = self.get(fdurl).json() self.assertIsNotNone(detail) self.assertIsNotNone(detail['id']) @@ -69,8 +69,8 @@ class FilesApiTest(ApiTestBase): 'dst_dir': '/', 'operation': 'copy', } - u = urlparse.urlparse(furl) - parsed_furl = urlparse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) + u = urllib.parse.urlparse(furl) + parsed_furl = urllib.parse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) res = self.post(parsed_furl+ '?p=' + quote(file_path), data=data) assert_in('tmp_file (1).txt', res.text) @@ -81,8 +81,8 @@ class FilesApiTest(ApiTestBase): 'dst_dir': '/', 'operation': 'copy', } - u = urlparse.urlparse(furl) - parsed_furl = urlparse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) + u = urllib.parse.urlparse(furl) + parsed_furl = urllib.parse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) res = self.post(parsed_furl+ '?p=' + quote(file_path), data=data) assert_in('tmp_file (2).txt', res.text) @@ -92,8 +92,8 @@ class FilesApiTest(ApiTestBase): 'dst_dir': '/', 'operation': 'move', } - u = urlparse.urlparse(furl) - parsed_furl = urlparse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) + u = urllib.parse.urlparse(furl) + parsed_furl = urllib.parse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) res = self.post(parsed_furl+ '?p=' + quote(file_path), data=data) assert_in('tmp_file%20%283%29.txt', res.text) @@ -118,13 +118,13 @@ class FilesApiTest(ApiTestBase): 'dst_dir': '/', 'operation': 'copy', } - u = urlparse.urlparse(furl) - parsed_furl = urlparse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) + u = urllib.parse.urlparse(furl) + parsed_furl = urllib.parse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) res = self.post(parsed_furl+ '?p=' + quote(file_path), data=data) assert_in(tmp_file, res.text) # get info of copied file in dst dir('/') - fdurl = repo.file_url + u'detail/?p=/%s' % quote(tmp_file) + fdurl = repo.file_url + 'detail/?p=/%s' % quote(tmp_file) detail = self.get(fdurl).json() self.assertIsNotNone(detail) self.assertIsNotNone(detail['id']) @@ -136,8 +136,8 @@ class FilesApiTest(ApiTestBase): 'dst_dir': '/', 'operation': 'copy', } - u = urlparse.urlparse(furl) - parsed_furl = urlparse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) + u = urllib.parse.urlparse(furl) + parsed_furl = urllib.parse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) res = self.post(parsed_furl+ '?p=' + quote(file_path), data=data) assert_in('tmp_file (1).txt', res.text) @@ -148,8 +148,8 @@ class FilesApiTest(ApiTestBase): 'dst_dir': '/', 'operation': 'copy', } - u = urlparse.urlparse(furl) - parsed_furl = urlparse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) + u = urllib.parse.urlparse(furl) + parsed_furl = urllib.parse.urlunparse((u.scheme, u.netloc, u.path, '', '', '')) res = self.post(parsed_furl+ '?p=' + quote(file_path), data=data) assert_in('tmp_file (2).txt', res.text) @@ -157,37 +157,43 @@ class FilesApiTest(ApiTestBase): with self.get_tmp_repo() as repo: fname, furl = self.create_file(repo) res = self.get(furl) - self.assertRegexpMatches(res.text, '"http(.*)/%s"' % quote(fname)) + self.assertRegex(res.text, '"http(.*)/%s"' % quote(fname)) def test_download_file_without_reuse_token(self): with self.get_tmp_repo() as repo: fname, furl = self.create_file(repo) res = self.get(furl) - self.assertRegexpMatches(res.text, '"http(.*)/%s"' % quote(fname)) + self.assertRegex(res.text, '"http(.*)/%s"' % quote(fname)) # download for the first time - url = urllib.urlopen(res.text.strip('"')) + url = urllib.request.urlopen(res.text.strip('"')) code = url.getcode() self.assertEqual(code, 200) # download for the second time - url = urllib.urlopen(res.text.strip('"')) - code = url.getcode() - self.assertEqual(code, 400) + try: + url = urllib.request.urlopen(res.text.strip('"')) + except Exception as e: + assert 'HTTP Error 400: Bad Request' in str(e) + + # url = urllib.request.urlopen(res.text.strip('"')) + # code = url.getcode() + # self.assertEqual(code, 400) + def test_download_file_with_reuse_token(self): with self.get_tmp_repo() as repo: fname, furl = self.create_file(repo) res = self.get(furl + '&reuse=1') - self.assertRegexpMatches(res.text, '"http(.*)/%s"' % quote(fname)) + self.assertRegex(res.text, '"http(.*)/%s"' % quote(fname)) # download for the first time - url = urllib.urlopen(res.text.strip('"')) + url = urllib.request.urlopen(res.text.strip('"')) code = url.getcode() self.assertEqual(code, 200) # download for the second time - url = urllib.urlopen(res.text.strip('"')) + url = urllib.request.urlopen(res.text.strip('"')) code = url.getcode() self.assertEqual(code, 200) @@ -205,12 +211,12 @@ class FilesApiTest(ApiTestBase): } query = '?' + urlencode(data) res = self.get(repo.file_url + query) - self.assertRegexpMatches(res.text, r'"http(.*)/%s"' % quote(fname)) + self.assertRegex(res.text, r'"http(.*)/%s"' % quote(fname)) def test_get_file_detail(self): with self.get_tmp_repo() as repo: fname, _ = self.create_file(repo) - fdurl = repo.file_url + u'detail/?p=/%s' % quote(fname) + fdurl = repo.file_url + 'detail/?p=/%s' % quote(fname) detail = self.get(fdurl).json() self.assertIsNotNone(detail) self.assertIsNotNone(detail['id']) @@ -226,7 +232,7 @@ class FilesApiTest(ApiTestBase): def test_get_file_history(self): with self.get_tmp_repo() as repo: fname, _ = self.create_file(repo) - fhurl = repo.file_url + u'history/?p=%s' % quote(fname) + fhurl = repo.file_url + 'history/?p=%s' % quote(fname) history = self.get(fhurl).json() for commit in history['commits']: self.assertIsNotNone(commit['rev_file_size']) @@ -252,7 +258,7 @@ class FilesApiTest(ApiTestBase): with self.get_tmp_repo() as repo: upload_url = urljoin(repo.repo_url, 'upload-link') res = self.get(upload_url) - self.assertRegexpMatches(res.text, r'"http(.*)/upload-api/[^/]+"') + self.assertRegex(res.text, r'"http(.*)/upload-api/[^/]+"') def test_get_upload_link_with_invalid_repo_id(self): repo_url = urljoin(REPOS_URL, '12345678-1234-1234-1234-12345678901b') @@ -263,7 +269,7 @@ class FilesApiTest(ApiTestBase): with self.get_tmp_repo() as repo: update_url = urljoin(repo.repo_url, 'update-link') res = self.get(update_url) - self.assertRegexpMatches(res.text, r'"http(.*)/update-api/[^/]+"') + self.assertRegex(res.text, r'"http(.*)/update-api/[^/]+"') def test_get_update_link_with_invalid_repo_id(self): repo_url = urljoin(REPOS_URL, '12345678-1234-1234-1234-12345678901b') @@ -303,7 +309,7 @@ class FilesApiTest(ApiTestBase): with self.get_tmp_repo() as repo: upload_blks_url = urljoin(repo.repo_url, 'upload-blks-link') res = self.get(upload_blks_url) - self.assertRegexpMatches(res.text, r'"http(.*)/upload-blks-api/[^/]+"') + self.assertRegex(res.text, r'"http(.*)/upload-blks-api/[^/]+"') def test_get_upload_blocks_link_with_invalid_repo_id(self): repo_url = urljoin(REPOS_URL, '12345678-1234-1234-1234-12345678901b') @@ -314,7 +320,7 @@ class FilesApiTest(ApiTestBase): with self.get_tmp_repo() as repo: update_blks_url = urljoin(repo.repo_url, 'update-blks-link') res = self.get(update_blks_url) - self.assertRegexpMatches(res.text, r'"http(.*)/update-blks-api/[^/]+"') + self.assertRegex(res.text, r'"http(.*)/update-blks-api/[^/]+"') def test_get_update_blocks_link_with_invalid_repo_id(self): repo_url = urljoin(REPOS_URL, '12345678-1234-1234-1234-12345678901b') @@ -395,13 +401,13 @@ class FilesApiTest(ApiTestBase): with self.get_tmp_repo() as repo: _, durl = self.create_dir(repo) res = self.delete(durl) - self.assertEqual(res.text, u'"success"') + self.assertEqual(res.text, '"success"') self.get(durl, expected=404) @pytest.mark.xfail def test_create_dir_with_parents(self): with self.get_tmp_repo() as repo: - path = u'/level1/level 2/level_3/目录4' + path = '/level1/level 2/level_3/目录4' self.create_dir_with_parents(repo, path) def create_dir_with_parents(self, repo, path): diff --git a/tests/api/test_obtain_auth_token.py b/tests/api/test_obtain_auth_token.py index 8d62ee913b..49197291c6 100644 --- a/tests/api/test_obtain_auth_token.py +++ b/tests/api/test_obtain_auth_token.py @@ -58,7 +58,7 @@ class ObtainAuthTokenTest(BaseTestCase): self.assertEqual(400, resp.status_code) json_resp = json.loads(resp.content) - assert json_resp['username'] == [u'This field may not be blank.'] + assert json_resp['username'] == ['This field may not be blank.'] def test_can_obtain_token_v2(self): resp = self.client.post(TOKEN_URL, { diff --git a/tests/api/test_repos.py b/tests/api/test_repos.py index ce564e5dc4..c0ef66c3bd 100644 --- a/tests/api/test_repos.py +++ b/tests/api/test_repos.py @@ -121,7 +121,7 @@ class ReposApiTest(ApiTestBase): assert ra.repo_id in tokens assert rb.repo_id in tokens assert fake_repo_id not in tokens - for repo_id, token in tokens.iteritems(): + for repo_id, token in tokens.items(): self._get_repo_info(token, repo_id) def test_generate_repo_tokens_reject_invalid_params(self): @@ -212,7 +212,7 @@ class NewReposApiTest(BaseTestCase): 'random_key': enc_info.random_key, } res = self.client.post(REPOS_URL, data=data) - print res + print(res) assert res.status_code == 400 # repo = res.json() diff --git a/tests/api/test_search.py b/tests/api/test_search.py index 0ae54a34b6..4546f6e104 100644 --- a/tests/api/test_search.py +++ b/tests/api/test_search.py @@ -72,6 +72,6 @@ class SearchTest(BaseTestCase): self.login_as(self.user) resp = self.client.get(self.url + '?q=lian&search_repo=%s&search_path=%s' % (self.repo_id, '/')) json_resp = json.loads(resp.content) - print json_resp + print(json_resp) assert json_resp['total'] == self.mock_total assert json_resp['results'][0]['repo_id'] == self.mock_results[0]['repo_id'] diff --git a/tests/api/test_shared_repo.py b/tests/api/test_shared_repo.py index f7b8a32446..c7a75f691a 100644 --- a/tests/api/test_shared_repo.py +++ b/tests/api/test_shared_repo.py @@ -27,7 +27,7 @@ class SharedRepoTest(BaseTestCase): url = self.shared_repo_url % self.repo_id resp = self.client.put(url) self.assertEqual(200, resp.status_code) - assert "success" in resp.content + assert b"success" in resp.content @patch('seahub.base.accounts.UserPermissions.can_add_public_repo', MagicMock(return_value=True)) def test_user_can_share_repo_to_public(self): @@ -37,7 +37,7 @@ class SharedRepoTest(BaseTestCase): url = self.shared_repo_url % self.repo.id resp = self.client.put(url) self.assertEqual(200, resp.status_code) - assert "success" in resp.content + assert b"success" in resp.content def test_user_can_not_share_repo_to_public_when_add_public_repo_disabled(self): self.login_as(self.user) @@ -56,7 +56,7 @@ class SharedRepoTest(BaseTestCase): resp = self.client.put(self.shared_repo_url % self.repo_id) self.assertEqual(200, resp.status_code) - assert "success" in resp.content + assert b"success" in resp.content def test_user_can_not_set_pub_repo_when_setting_disalbed(self): assert bool(self.config.ENABLE_USER_CREATE_ORG_REPO) is True @@ -76,7 +76,7 @@ class SharedRepoTest(BaseTestCase): url = self.shared_repo_url % self.repo_id resp = self.client.delete(url) self.assertEqual(200, resp.status_code) - assert "success" in resp.content + assert b"success" in resp.content def test_user_can_unshare_public_repo(self): seafile_api.add_inner_pub_repo(self.repo_id, "r") @@ -86,4 +86,4 @@ class SharedRepoTest(BaseTestCase): url = self.shared_repo_url % self.repo_id resp = self.client.delete(url) self.assertEqual(403, resp.status_code) - assert 'You do not have permission to unshare library.' in resp.content + assert b'You do not have permission to unshare library.' in resp.content diff --git a/tests/api/test_shares.py b/tests/api/test_shares.py index 9d4605dc21..da0c708ffe 100644 --- a/tests/api/test_shares.py +++ b/tests/api/test_shares.py @@ -56,7 +56,7 @@ class FileSharedLinkApiTest(BaseTestCase): 'application/x-www-form-urlencoded', ) self.assertEqual(201, resp.status_code) - self.assertRegexpMatches(resp._headers['location'][1], + self.assertRegex(resp._headers['location'][1], r'http(.*)/f/(\w{10,100})/') token = resp._headers['location'][1].split('/')[-2] @@ -72,7 +72,7 @@ class FileSharedLinkApiTest(BaseTestCase): 'application/x-www-form-urlencoded', ) self.assertEqual(201, resp.status_code) - self.assertRegexpMatches(resp._headers['location'][1], + self.assertRegex(resp._headers['location'][1], r'http(.*)/f/(\w{10,100})/') token = resp._headers['location'][1].split('/')[-2] @@ -89,7 +89,7 @@ class FileSharedLinkApiTest(BaseTestCase): 'application/x-www-form-urlencoded', ) self.assertEqual(201, resp.status_code) - self.assertRegexpMatches(resp._headers['location'][1], + self.assertRegex(resp._headers['location'][1], r'http(.*)/f/(\w{10,100})/') token = resp._headers['location'][1].split('/')[-2] @@ -106,7 +106,7 @@ class FileSharedLinkApiTest(BaseTestCase): 'application/x-www-form-urlencoded', ) self.assertEqual(201, resp.status_code) - self.assertRegexpMatches(resp._headers['location'][1], + self.assertRegex(resp._headers['location'][1], r'http(.*)/f/(\w{10,100})/') token = resp._headers['location'][1].split('/')[-2] @@ -125,7 +125,7 @@ class FileSharedLinkApiTest(BaseTestCase): ) self.assertEqual(201, resp.status_code) self.dir_link_location = resp._headers['location'][1] - self.assertRegexpMatches(self.dir_link_location, + self.assertRegex(self.dir_link_location, r'http(.*)/d/(\w{10,100})/') token = resp._headers['location'][1].split('/')[-2] @@ -142,7 +142,7 @@ class FileSharedLinkApiTest(BaseTestCase): ) self.assertEqual(201, resp.status_code) self.dir_link_location = resp._headers['location'][1] - self.assertRegexpMatches(self.dir_link_location, + self.assertRegex(self.dir_link_location, r'http(.*)/d/(\w{10,100})/') token = resp._headers['location'][1].split('/')[-2] @@ -160,7 +160,7 @@ class FileSharedLinkApiTest(BaseTestCase): ) self.assertEqual(201, resp.status_code) self.dir_link_location = resp._headers['location'][1] - self.assertRegexpMatches(self.dir_link_location, + self.assertRegex(self.dir_link_location, r'http(.*)/d/(\w{10,100})/') token = resp._headers['location'][1].split('/')[-2] @@ -178,7 +178,7 @@ class FileSharedLinkApiTest(BaseTestCase): ) self.assertEqual(201, resp.status_code) self.dir_link_location = resp._headers['location'][1] - self.assertRegexpMatches(self.dir_link_location, + self.assertRegex(self.dir_link_location, r'http(.*)/d/(\w{10,100})/') token = resp._headers['location'][1].split('/')[-2] @@ -197,7 +197,7 @@ class FileSharedLinkApiTest(BaseTestCase): ) self.assertEqual(201, resp.status_code) self.dir_link_location = resp._headers['location'][1] - self.assertRegexpMatches(self.dir_link_location, + self.assertRegex(self.dir_link_location, r'http(.*)/u/d/(\w{10,100})/') token = resp._headers['location'][1].split('/')[-2] @@ -214,7 +214,7 @@ class FileSharedLinkApiTest(BaseTestCase): ) self.assertEqual(201, resp.status_code) self.dir_link_location = resp._headers['location'][1] - self.assertRegexpMatches(self.dir_link_location, + self.assertRegex(self.dir_link_location, r'http(.*)/u/d/(\w{10,100})/') token = resp._headers['location'][1].split('/')[-2] diff --git a/tests/api/test_starredfiles.py b/tests/api/test_starredfiles.py index 6b19e6bf26..3e9022101e 100644 --- a/tests/api/test_starredfiles.py +++ b/tests/api/test_starredfiles.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import json -import urllib2 +import urllib.request, urllib.error, urllib.parse from django.core.urlresolvers import reverse @@ -15,14 +15,14 @@ class StarredFileTest(BaseTestCase, Fixtures): is_dir=False).save() self.unicode_file = self.create_file(repo_id=self.repo.id, parent_dir='/', - filename=u'März_中文_%2F_FG2_SW#1a.jpg', + filename='März_中文_%2F_FG2_SW#1a.jpg', username=self.user.username) def tearDown(self): self.remove_repo() def js_encodeURIComponent(self, string): - return urllib2.quote(string.encode('utf-8'), safe='~()*!.\'') + return urllib.parse.quote(string.encode('utf-8'), safe='~()*!.\'') ########## test cases ########## def test_can_list(self): @@ -41,7 +41,7 @@ class StarredFileTest(BaseTestCase, Fixtures): 'p': self.file }) self.assertEqual(201, resp.status_code) - self.assertEqual('"success"', resp.content) + self.assertEqual(b'"success"', resp.content) def test_cannot_add_random_filename(self): self.login_as(self.user) @@ -75,7 +75,7 @@ class StarredFileTest(BaseTestCase, Fixtures): 'p': self.unicode_file, }) self.assertEqual(201, resp.status_code) - self.assertEqual('"success"', resp.content) + self.assertEqual(b'"success"', resp.content) self.assertEqual(2, len(UserStarredFiles.objects.all())) def test_can_delete_unicode(self): @@ -90,6 +90,6 @@ class StarredFileTest(BaseTestCase, Fixtures): resp = self.client.delete(reverse('starredfiles') + '?repo_id=' + self.repo.id + '&p=' + - urllib2.quote(self.unicode_file.encode('utf-8'))) + urllib.parse.quote(self.unicode_file.encode('utf-8'))) self.assertEqual(200, resp.status_code) self.assertEqual(1, len(UserStarredFiles.objects.all())) diff --git a/tests/api/urls.py b/tests/api/urls.py index 602d6a8b0b..151445fc49 100644 --- a/tests/api/urls.py +++ b/tests/api/urls.py @@ -5,12 +5,12 @@ TOKEN_URL = apiurl('/api2/auth-token/') AUTH_PING_URL = apiurl('/api2/auth/ping/') ACCOUNTS_URL = apiurl('/api2/accounts/') -AVATAR_BASE_URL = apiurl(u'/api2/avatars/') +AVATAR_BASE_URL = apiurl('/api2/avatars/') REPOS_URL = apiurl('/api2/repos/') GET_REPO_TOKENS_URL = apiurl('/api2/repo-tokens/') -GROUPS_URL = apiurl(u'/api2/groups/') +GROUPS_URL = apiurl('/api2/groups/') USERMSGS_COUNT_URL = apiurl('/api2/unseen_messages/') diff --git a/tests/common/common.py b/tests/common/common.py index 7cc572759d..96fb59b959 100644 --- a/tests/common/common.py +++ b/tests/common/common.py @@ -1,19 +1,19 @@ import os -import urlparse +import urllib.parse -BASE_URL = os.getenv('SEAHUB_TEST_BASE_URL', u'http://127.0.0.1:8000') -USERNAME = os.getenv('SEAHUB_TEST_USERNAME', u'test@seafiletest.com') -PASSWORD = os.getenv('SEAHUB_TEST_PASSWORD', u'testtest') -ADMIN_USERNAME = os.getenv('SEAHUB_TEST_ADMIN_USERNAME', u'admin@seafiletest.com') -ADMIN_PASSWORD = os.getenv('SEAHUB_TEST_ADMIN_PASSWORD', u'adminadmin') +BASE_URL = os.getenv('SEAHUB_TEST_BASE_URL', 'http://127.0.0.1:8000') +USERNAME = os.getenv('SEAHUB_TEST_USERNAME', 'test@seafiletest.com') +PASSWORD = os.getenv('SEAHUB_TEST_PASSWORD', 'testtest') +ADMIN_USERNAME = os.getenv('SEAHUB_TEST_ADMIN_USERNAME', 'admin@seafiletest.com') +ADMIN_PASSWORD = os.getenv('SEAHUB_TEST_ADMIN_PASSWORD', 'adminadmin') -if os.getenv('SEAHUB_TEST_IS_PRO', u'') == u'': +if os.getenv('SEAHUB_TEST_IS_PRO', '') == '': IS_PRO = False else: S_PRO = True def get_seafile_http_sync_base_url(): - u = urlparse.urlparse(BASE_URL) + u = urllib.parse.urlparse(BASE_URL) return '{}://{}/seafhttp'.format(u.scheme, u.hostname) SEAFILE_BASE_URL = get_seafile_http_sync_base_url() diff --git a/tests/common/utils.py b/tests/common/utils.py index 6fe5022f49..4ae2e408ff 100644 --- a/tests/common/utils.py +++ b/tests/common/utils.py @@ -7,7 +7,7 @@ from .common import BASE_URL def randstring(length=0): if length == 0: length = random.randint(1, 30) - return ''.join(random.choice(string.lowercase) for i in range(length)) + return ''.join(random.choice(string.ascii_lowercase) for i in range(length)) def urljoin(base, *args): url = base diff --git a/tests/install-deps.sh b/tests/install-deps.sh index d8b65dd578..b6fdeeb804 100755 --- a/tests/install-deps.sh +++ b/tests/install-deps.sh @@ -9,7 +9,6 @@ SEAHUB_SRCDIR=$(dirname "${SEAHUB_TESTSDIR}") cd "$SEAHUB_SRCDIR" -sudo apt-get install -y nginx sudo mv /etc/nginx/sites-enabled/default /etc/nginx/default.backup cat <<'EOF' >/tmp/seafile.conf server { @@ -26,5 +25,5 @@ server { } EOF -sudo mv /tmp/seafile.conf /etc/nginx/sites-enabled/ +sudo mv /tmp/seafile.conf /etc/nginx/sites-enabled/default sudo service nginx restart diff --git a/tests/seahub/auth/views/test_login.py b/tests/seahub/auth/views/test_login.py index 381fcef502..7969474b19 100644 --- a/tests/seahub/auth/views/test_login.py +++ b/tests/seahub/auth/views/test_login.py @@ -22,7 +22,7 @@ class LoginTest(BaseTestCase): ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL) + self.assertRegex(resp['Location'], settings.LOGIN_REDIRECT_URL) def test_can_login_with_login_id(self): p = Profile.objects.add_or_update(self.user.username, 'nickname') @@ -36,7 +36,7 @@ class LoginTest(BaseTestCase): 'password': self.user_password} ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL) + self.assertRegex(resp['Location'], settings.LOGIN_REDIRECT_URL) def test_redirect_to_after_success_login(self): resp = self.client.post( @@ -46,7 +46,7 @@ class LoginTest(BaseTestCase): ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], r'/foo/') + self.assertRegex(resp['Location'], r'/foo/') def test_bad_redirect_to_after_success_login(self): from django.utils.http import urlquote @@ -57,7 +57,7 @@ class LoginTest(BaseTestCase): ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL) + self.assertRegex(resp['Location'], settings.LOGIN_REDIRECT_URL) def test_bad_redirect2_to_after_success_login(self): from django.utils.http import urlquote @@ -68,7 +68,7 @@ class LoginTest(BaseTestCase): ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL) + self.assertRegex(resp['Location'], settings.LOGIN_REDIRECT_URL) def test_redirect_to_other_host_after_success_login(self): from django.utils.http import urlquote @@ -79,7 +79,7 @@ class LoginTest(BaseTestCase): ) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL) + self.assertRegex(resp['Location'], settings.LOGIN_REDIRECT_URL) def test_force_passwd_change_when_login(self): UserOptions.objects.set_force_passwd_change(self.user.username) diff --git a/tests/seahub/base/database_storage/test_database_storage.py b/tests/seahub/base/database_storage/test_database_storage.py index 9754f95ed9..4ea29f7313 100644 --- a/tests/seahub/base/database_storage/test_database_storage.py +++ b/tests/seahub/base/database_storage/test_database_storage.py @@ -1,3 +1,4 @@ +import os from django.conf import settings from django.db import connection @@ -6,8 +7,12 @@ from seahub.test_utils import BaseTestCase class DatabaseStorageTest(BaseTestCase): - def setUp(self): + + @classmethod + def setUpClass(cls): connection.cursor().execute('''CREATE TABLE IF NOT EXISTS `avatar_uploaded` (`filename` TEXT NOT NULL, `filename_md5` CHAR(32) NOT NULL PRIMARY KEY, `data` MEDIUMTEXT NOT NULL, `size` INTEGER NOT NULL, `mtime` datetime NOT NULL);''') + + def setUp(self): self.dbs_options = { 'table': 'avatar_uploaded', 'base_url': '%simage-view/' % settings.SITE_ROOT, @@ -15,27 +20,29 @@ class DatabaseStorageTest(BaseTestCase): 'data_column': 'data', 'size_column': 'size', } + self.image_path = os.path.join(os.getcwd(), 'media/img/member-list-empty-2x.png') - def tearDown(self): + @classmethod + def tearDownClass(cls): connection.cursor().execute("DROP TABLE `avatar_uploaded`;") def test__save(self): storage = DatabaseStorage(options=self.dbs_options) - ret = storage._save('name', open(__file__)) + ret = storage._save('name', open(self.image_path, 'rb')) assert ret == 'name' def test_exists(self): storage = DatabaseStorage(options=self.dbs_options) assert storage.exists('name') is False - ret = storage._save('name', open(__file__)) + ret = storage._save('name', open(self.image_path, 'rb')) assert ret == 'name' assert storage.exists('name') is True def test_delete(self): storage = DatabaseStorage(options=self.dbs_options) - ret = storage._save('name', open(__file__)) + ret = storage._save('name', open(self.image_path, 'rb')) assert ret == 'name' storage.delete('name') @@ -43,12 +50,12 @@ class DatabaseStorageTest(BaseTestCase): def test_size(self): storage = DatabaseStorage(options=self.dbs_options) - storage._save('name', open(__file__)) + storage._save('name', open(self.image_path, 'rb')) assert storage.size('name') > 0 def test_modified_time(self): storage = DatabaseStorage(options=self.dbs_options) - storage._save('name', open(__file__)) + storage._save('name', open(self.image_path, 'rb')) assert storage.modified_time('name') is not None diff --git a/tests/seahub/base/templatetags/test_seahub_tags.py b/tests/seahub/base/templatetags/test_seahub_tags.py index a96fb68ebd..025408310b 100644 --- a/tests/seahub/base/templatetags/test_seahub_tags.py +++ b/tests/seahub/base/templatetags/test_seahub_tags.py @@ -35,7 +35,7 @@ class Email2nicknameTest(BaseTestCase): class SeahubFilesizeformatTest(BaseTestCase): def test_seahub_filesizeformat(self): - assert seahub_filesizeformat(1) == u'1\xa0byte' - assert seahub_filesizeformat(1000) == u'1.0\xa0KB' - assert seahub_filesizeformat(1000000) == u'1.0\xa0MB' - assert seahub_filesizeformat(1000000000) == u'1.0\xa0GB' + assert seahub_filesizeformat(1) == '1\xa0byte' + assert seahub_filesizeformat(1000) == '1.0\xa0KB' + assert seahub_filesizeformat(1000000) == '1.0\xa0MB' + assert seahub_filesizeformat(1000000000) == '1.0\xa0GB' diff --git a/tests/seahub/base/test_models.py b/tests/seahub/base/test_models.py index 258bce8f27..551fc9df10 100644 --- a/tests/seahub/base/test_models.py +++ b/tests/seahub/base/test_models.py @@ -67,13 +67,13 @@ class FileCommentTest(BaseTestCase): def test_md5_repo_id_parent_path(self): md5 = FileUUIDMap.md5_repo_id_parent_path(self.repo_id, '/') - assert md5 == hashlib.md5(self.repo_id + '/').hexdigest() + assert md5 == hashlib.md5((self.repo_id + '/').encode('utf-8')).hexdigest() md5 = FileUUIDMap.md5_repo_id_parent_path(self.repo_id, '/foo') - assert md5 == hashlib.md5(self.repo_id + '/foo').hexdigest() + assert md5 == hashlib.md5((self.repo_id + '/foo').encode('utf-8')).hexdigest() md5 = FileUUIDMap.md5_repo_id_parent_path(self.repo_id, '/foo/') - assert md5 == hashlib.md5(self.repo_id + '/foo').hexdigest() + assert md5 == hashlib.md5((self.repo_id + '/foo').encode('utf-8')).hexdigest() def test_normalize_path(self): o = FileComment.objects.add(repo_id=self.repo_id, parent_path='/foo/bar/', diff --git a/tests/seahub/forms/test_add_user_form.py b/tests/seahub/forms/test_add_user_form.py index 92894ee8ef..fa6447324e 100644 --- a/tests/seahub/forms/test_add_user_form.py +++ b/tests/seahub/forms/test_add_user_form.py @@ -17,10 +17,10 @@ class TestAddUserForm(TestCase): mock_user_number_over_limit.return_value = False user_info = { - 'email':'%s@%s.com' % (randstring(10), randstring(10)) , + 'email': '%s@%s.com' % (randstring(10), randstring(10)), 'role': DEFAULT_USER, - 'password1':'password', - 'password2':'password', + 'password1': 'password', + 'password2': 'password', } f = AddUserForm(data = user_info) @@ -33,10 +33,10 @@ class TestAddUserForm(TestCase): mock_user_number_over_limit.return_value = True user_info = { - 'email':'%s@%s.com' % (randstring(10), randstring(10)) , + 'email': '%s@%s.com' % (randstring(10), randstring(10)), 'role': DEFAULT_USER, - 'password1':'password', - 'password2':'password', + 'password1': 'password', + 'password2': 'password', } f = AddUserForm(data = user_info) @@ -52,8 +52,8 @@ class TestAddUserForm(TestCase): # invalid email 'email': USERNAME, 'role': DEFAULT_USER, - 'password1':'password', - 'password2':'password', + 'password1': 'password', + 'password2': 'password', } f = AddUserForm(data = user_info) @@ -66,11 +66,11 @@ class TestAddUserForm(TestCase): mock_user_number_over_limit.return_value = False user_info = { - 'email':'%s@%s.com' % (randstring(10), randstring(10)) , + 'email': '%s@%s.com' % (randstring(10), randstring(10)), 'role': DEFAULT_USER, # invalid password - 'password1':'password1', - 'password2':'password2', + 'password1': 'password1', + 'password2': 'password2', } f = AddUserForm(data = user_info) diff --git a/tests/seahub/group/views/test_group_check.py b/tests/seahub/group/views/test_group_check.py index c9251ecbd0..05f7248b8b 100644 --- a/tests/seahub/group/views/test_group_check.py +++ b/tests/seahub/group/views/test_group_check.py @@ -14,17 +14,17 @@ class GroupCheckTest(BaseTestCase): self.fake_request.user = AnonymousUser() resp = a_view(self.fake_request, self.group.id) self.assertEqual(resp.status_code, 302) - self.assertRegexpMatches(resp['Location'], '/accounts/login') + self.assertRegex(resp['Location'], '/accounts/login') def test_group_user(self): self.fake_request.user = self.user resp = a_view(self.fake_request, self.group.id) self.assertEqual(resp.status_code, 200) - assert 'success' in resp.content + assert b'success' in resp.content def test_admin_user(self): self.fake_request.user = self.admin resp = a_view(self.fake_request, self.group.id) self.assertEqual(resp.status_code, 200) - assert 'Permission denied' in resp.content - assert 'success' not in resp.content + assert b'Permission denied' in resp.content + assert b'success' not in resp.content diff --git a/tests/seahub/invitations/test_views.py b/tests/seahub/invitations/test_views.py index d855b54b57..4db1943f05 100644 --- a/tests/seahub/invitations/test_views.py +++ b/tests/seahub/invitations/test_views.py @@ -25,7 +25,7 @@ class TokenViewTest(BaseTestCase): def test_get(self): resp = self.client.get(self.url) self.assertEqual(200, resp.status_code) - self.assertRegexpMatches(resp.content, 'Set your password') + self.assertRegex(resp.content, b'Set your password') def test_expired_token(self): self.iv.expire_time = timezone.now() diff --git a/tests/seahub/notifications/management/commands/test_send_file_updates.py b/tests/seahub/notifications/management/commands/test_send_file_updates.py index d572173b3f..e91c830e19 100644 --- a/tests/seahub/notifications/management/commands/test_send_file_updates.py +++ b/tests/seahub/notifications/management/commands/test_send_file_updates.py @@ -21,43 +21,43 @@ class CommandTest(BaseTestCase): def _repo_evs(self, ): l = [ - {'username': self.user.username, 'commit_id': None, 'obj_type': u'repo', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'timestamp': datetime.datetime(2018, 11, 5, 6, 46, 2), 'op_type': u'create', 'path': u'/', 'id': 254L, 'op_user': u'foo@foo.com', u'repo_name': u'tests\\'}, - {'username': self.user.username, 'commit_id': None, 'obj_type': u'repo', 'repo_id': u'f8dc0bc8-eae0-4063-9beb-790071168794', 'timestamp': datetime.datetime(2018, 11, 6, 9, 52, 6), 'op_type': u'delete', 'path': u'/', 'id': 289L, 'op_user': u'foo@foo.com', u'repo_name': u'123'}, - {'username': self.user.username, 'commit_id': u'93fb5d8f07e03e5c947599cd7c948965426aafec', 'obj_type': u'repo', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'timestamp': datetime.datetime(2018, 11, 7, 2, 35, 34), u'old_repo_name': u'tests\\', 'op_type': u'rename', 'path': u'/', 'id': 306L, 'op_user': u'foo@foo.com', u'repo_name': u'tests\\123'}, - {'username': self.user.username, 'commit_id': None, 'obj_type': u'repo', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'timestamp': datetime.datetime(2018, 11, 7, 3, 13, 2), u'days': 0, 'op_type': u'clean-up-trash', 'path': u'/', 'id': 308L, 'op_user': u'foo@foo.com', u'repo_name': u'tests\\123'}, - {'username': self.user.username, 'commit_id': None, 'obj_type': u'repo', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'timestamp': datetime.datetime(2018, 11, 7, 3, 12, 43), u'days': 3, 'op_type': u'clean-up-trash', 'path': u'/', 'id': 307L, 'op_user': u'foo@foo.com', u'repo_name': u'tests\\123'}, + {'username': self.user.username, 'commit_id': None, 'obj_type': 'repo', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'timestamp': datetime.datetime(2018, 11, 5, 6, 46, 2), 'op_type': 'create', 'path': '/', 'id': 254, 'op_user': 'foo@foo.com', 'repo_name': 'tests\\'}, + {'username': self.user.username, 'commit_id': None, 'obj_type': 'repo', 'repo_id': 'f8dc0bc8-eae0-4063-9beb-790071168794', 'timestamp': datetime.datetime(2018, 11, 6, 9, 52, 6), 'op_type': 'delete', 'path': '/', 'id': 289, 'op_user': 'foo@foo.com', 'repo_name': '123'}, + {'username': self.user.username, 'commit_id': '93fb5d8f07e03e5c947599cd7c948965426aafec', 'obj_type': 'repo', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'timestamp': datetime.datetime(2018, 11, 7, 2, 35, 34), 'old_repo_name': 'tests\\', 'op_type': 'rename', 'path': '/', 'id': 306, 'op_user': 'foo@foo.com', 'repo_name': 'tests\\123'}, + {'username': self.user.username, 'commit_id': None, 'obj_type': 'repo', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'timestamp': datetime.datetime(2018, 11, 7, 3, 13, 2), 'days': 0, 'op_type': 'clean-up-trash', 'path': '/', 'id': 308, 'op_user': 'foo@foo.com', 'repo_name': 'tests\\123'}, + {'username': self.user.username, 'commit_id': None, 'obj_type': 'repo', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'timestamp': datetime.datetime(2018, 11, 7, 3, 12, 43), 'days': 3, 'op_type': 'clean-up-trash', 'path': '/', 'id': 307, 'op_user': 'foo@foo.com', 'repo_name': 'tests\\123'}, ] return [Record(**x) for x in l] def _dir_evs(self, ): l = [ - {'username': self.user.username, 'commit_id': u'8ff6473e9ef5229a632e1481a1b28d52673220ec', 'obj_type': u'dir', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', u'obj_id': u'0000000000000000000000000000000000000000', 'timestamp': datetime.datetime(2018, 11, 6, 9, 10, 45), 'op_type': u'create', 'path': u'/xx', 'id': 260L, 'op_user': u'foo@foo.com', u'repo_name': u'tests\\'}, + {'username': self.user.username, 'commit_id': '8ff6473e9ef5229a632e1481a1b28d52673220ec', 'obj_type': 'dir', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'obj_id': '0000000000000000000000000000000000000000', 'timestamp': datetime.datetime(2018, 11, 6, 9, 10, 45), 'op_type': 'create', 'path': '/xx', 'id': 260, 'op_user': 'foo@foo.com', 'repo_name': 'tests\\'}, - {'username': self.user.username, 'commit_id': u'bb3ef321899d2f75ecf56098cb89e6b13c48cff9', 'obj_type': u'dir', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', u'obj_id': u'0000000000000000000000000000000000000000', 'timestamp': datetime.datetime(2018, 11, 6, 9, 27, 3), 'op_type': u'delete', 'path': u'/aa', 'id': 268L, 'op_user': u'foo@foo.com', u'repo_name': u'tests\\'}, + {'username': self.user.username, 'commit_id': 'bb3ef321899d2f75ecf56098cb89e6b13c48cff9', 'obj_type': 'dir', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'obj_id': '0000000000000000000000000000000000000000', 'timestamp': datetime.datetime(2018, 11, 6, 9, 27, 3), 'op_type': 'delete', 'path': '/aa', 'id': 268, 'op_user': 'foo@foo.com', 'repo_name': 'tests\\'}, - {'username': self.user.username, 'commit_id': u'016435e95ace96902ea1bfa1e7688f45804d5aa4', 'obj_type': u'dir', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', u'obj_id': u'95421aa563cf474dce02b7fadc532c17c11cd97a', 'timestamp': datetime.datetime(2018, 11, 6, 9, 38, 32), u'old_path': u'/11', 'op_type': u'move', 'path': u'/new/11', u'repo_name': u'tests\\', 'id': 283L, 'op_user': u'foo@foo.com', u'size': -1}, + {'username': self.user.username, 'commit_id': '016435e95ace96902ea1bfa1e7688f45804d5aa4', 'obj_type': 'dir', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'obj_id': '95421aa563cf474dce02b7fadc532c17c11cd97a', 'timestamp': datetime.datetime(2018, 11, 6, 9, 38, 32), 'old_path': '/11', 'op_type': 'move', 'path': '/new/11', 'repo_name': 'tests\\', 'id': 283, 'op_user': 'foo@foo.com', 'size': -1}, - {'username': self.user.username, 'commit_id': u'712504f1cfd94b0813763a106eb4140a5dba156a', 'obj_type': u'dir', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', u'obj_id': u'4d83a9b62084fef33ec99787425f91df356ae307', 'timestamp': datetime.datetime(2018, 11, 6, 9, 39, 10), u'old_path': u'/new', 'op_type': u'rename', 'path': u'/new2', u'repo_name': u'tests\\', 'id': 284L, 'op_user': u'foo@foo.com', u'size': -1}, + {'username': self.user.username, 'commit_id': '712504f1cfd94b0813763a106eb4140a5dba156a', 'obj_type': 'dir', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'obj_id': '4d83a9b62084fef33ec99787425f91df356ae307', 'timestamp': datetime.datetime(2018, 11, 6, 9, 39, 10), 'old_path': '/new', 'op_type': 'rename', 'path': '/new2', 'repo_name': 'tests\\', 'id': 284, 'op_user': 'foo@foo.com', 'size': -1}, - {'username': self.user.username, 'commit_id': u'2f7021e0804187b8b09ec82142e0f8b53771cc69', 'obj_type': u'dir', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', u'obj_id': u'0000000000000000000000000000000000000000', 'timestamp': datetime.datetime(2018, 11, 6, 9, 27, 6), 'op_type': u'recover', 'path': u'/aa', 'id': 269L, 'op_user': u'foo@foo.com', u'repo_name': u'tests\\'}, + {'username': self.user.username, 'commit_id': '2f7021e0804187b8b09ec82142e0f8b53771cc69', 'obj_type': 'dir', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'obj_id': '0000000000000000000000000000000000000000', 'timestamp': datetime.datetime(2018, 11, 6, 9, 27, 6), 'op_type': 'recover', 'path': '/aa', 'id': 269, 'op_user': 'foo@foo.com', 'repo_name': 'tests\\'}, ] return [Record(**x) for x in l] def _file_evs(self, ): l = [ - {'username': self.user.username, 'commit_id': u'658d8487b7e8916ee25703fbdf978b98ab76e3d4', 'obj_type': u'file', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', u'obj_id': u'0000000000000000000000000000000000000000', 'timestamp': datetime.datetime(2018, 11, 6, 9, 38, 23), 'op_type': u'create', 'path': u'/11/new/aa/new/yy/xx/bb/1.txt', u'repo_name': u'tests\\', 'id': 282L, 'op_user': u'foo@foo.com', u'size': 0}, + {'username': self.user.username, 'commit_id': '658d8487b7e8916ee25703fbdf978b98ab76e3d4', 'obj_type': 'file', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'obj_id': '0000000000000000000000000000000000000000', 'timestamp': datetime.datetime(2018, 11, 6, 9, 38, 23), 'op_type': 'create', 'path': '/11/new/aa/new/yy/xx/bb/1.txt', 'repo_name': 'tests\\', 'id': 282, 'op_user': 'foo@foo.com', 'size': 0}, - {'username': self.user.username, 'commit_id': u'04df2a831ba485bb6f216f62c1b47883c3e3433c', 'obj_type': u'file', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', u'obj_id': u'd16369af225687671348897a0ad918261866af5d', 'timestamp': datetime.datetime(2018, 11, 6, 9, 0, 14), 'op_type': u'delete', 'path': u'/aa1.txt', u'repo_name': u'tests\\', 'id': 257L, 'op_user': u'foo@foo.com', u'size': 2}, + {'username': self.user.username, 'commit_id': '04df2a831ba485bb6f216f62c1b47883c3e3433c', 'obj_type': 'file', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'obj_id': 'd16369af225687671348897a0ad918261866af5d', 'timestamp': datetime.datetime(2018, 11, 6, 9, 0, 14), 'op_type': 'delete', 'path': '/aa1.txt', 'repo_name': 'tests\\', 'id': 257, 'op_user': 'foo@foo.com', 'size': 2}, - {'username': self.user.username, 'commit_id': u'612f605faa112e4e8928dc08e91c669cea92ef59', 'obj_type': u'file', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', u'obj_id': u'd16369af225687671348897a0ad918261866af5d', 'timestamp': datetime.datetime(2018, 11, 6, 9, 0, 22), 'op_type': u'recover', 'path': u'/aa1.txt', u'repo_name': u'tests\\', 'id': 258L, 'op_user': u'foo@foo.com', u'size': 2}, + {'username': self.user.username, 'commit_id': '612f605faa112e4e8928dc08e91c669cea92ef59', 'obj_type': 'file', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'obj_id': 'd16369af225687671348897a0ad918261866af5d', 'timestamp': datetime.datetime(2018, 11, 6, 9, 0, 22), 'op_type': 'recover', 'path': '/aa1.txt', 'repo_name': 'tests\\', 'id': 258, 'op_user': 'foo@foo.com', 'size': 2}, - {'username': self.user.username, 'commit_id': u'106e6e12138bf0e12fbd558da73ff24502807f3e', 'obj_type': u'file', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', u'obj_id': u'28054f8015aada8b5232943d072526541f5227f9', 'timestamp': datetime.datetime(2018, 11, 6, 9, 0, 30), 'op_type': u'edit', 'path': u'/aa1.txt', u'repo_name': u'tests\\', 'id': 259L, 'op_user': u'foo@foo.com', u'size': 4}, + {'username': self.user.username, 'commit_id': '106e6e12138bf0e12fbd558da73ff24502807f3e', 'obj_type': 'file', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'obj_id': '28054f8015aada8b5232943d072526541f5227f9', 'timestamp': datetime.datetime(2018, 11, 6, 9, 0, 30), 'op_type': 'edit', 'path': '/aa1.txt', 'repo_name': 'tests\\', 'id': 259, 'op_user': 'foo@foo.com', 'size': 4}, - {'username': self.user.username, 'commit_id': u'1c9a12a2d8cca79f261eb7c65c118a3ea4f7b850', 'obj_type': u'file', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', u'obj_id': u'28054f8015aada8b5232943d072526541f5227f9', 'timestamp': datetime.datetime(2018, 11, 6, 9, 36, 45), u'old_path': u'/11/new/aa/new/yy/xx/aa4.txt', 'op_type': u'move', 'path': u'/aa4.txt', u'repo_name': u'tests\\', 'id': 279L, 'op_user': u'foo@foo.com', u'size': 4}, + {'username': self.user.username, 'commit_id': '1c9a12a2d8cca79f261eb7c65c118a3ea4f7b850', 'obj_type': 'file', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'obj_id': '28054f8015aada8b5232943d072526541f5227f9', 'timestamp': datetime.datetime(2018, 11, 6, 9, 36, 45), 'old_path': '/11/new/aa/new/yy/xx/aa4.txt', 'op_type': 'move', 'path': '/aa4.txt', 'repo_name': 'tests\\', 'id': 279, 'op_user': 'foo@foo.com', 'size': 4}, - {'username': self.user.username, 'commit_id': u'19cab0f3c53ee00cffe6eaa65f256ccc35a77a72', 'obj_type': u'file', 'repo_id': u'7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', u'obj_id': u'28054f8015aada8b5232943d072526541f5227f9', 'timestamp': datetime.datetime(2018, 11, 6, 9, 36, 59), u'old_path': u'/aa4.txt', 'op_type': u'rename', 'path': u'/aa5.txt', u'repo_name': u'tests\\', 'id': 280L, 'op_user': u'foo@foo.com', u'size': 4}, + {'username': self.user.username, 'commit_id': '19cab0f3c53ee00cffe6eaa65f256ccc35a77a72', 'obj_type': 'file', 'repo_id': '7d6b3f36-3ce1-45f1-8c82-b9532e3162c7', 'obj_id': '28054f8015aada8b5232943d072526541f5227f9', 'timestamp': datetime.datetime(2018, 11, 6, 9, 36, 59), 'old_path': '/aa4.txt', 'op_type': 'rename', 'path': '/aa5.txt', 'repo_name': 'tests\\', 'id': 280, 'op_user': 'foo@foo.com', 'size': 4}, ] return [Record(**x) for x in l] diff --git a/tests/seahub/profile/views/test_edit_profile.py b/tests/seahub/profile/views/test_edit_profile.py index 253bde9881..d77fd6b3ba 100644 --- a/tests/seahub/profile/views/test_edit_profile.py +++ b/tests/seahub/profile/views/test_edit_profile.py @@ -24,5 +24,5 @@ class EditProfileTest(BaseTestCase): 'nickname': 'new nickname' }) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], r'/profile/') + self.assertRegex(resp['Location'], r'/profile/') assert email2nickname(self.tmp_user.username) == 'new nickname' diff --git a/tests/seahub/role_permissions/test_utils.py b/tests/seahub/role_permissions/test_utils.py index 54ea696ffd..ebf84a2c5c 100644 --- a/tests/seahub/role_permissions/test_utils.py +++ b/tests/seahub/role_permissions/test_utils.py @@ -11,4 +11,4 @@ class UtilsTest(BaseTestCase): assert DEFAULT_USER in get_available_roles() def test_get_enabled_role_permissions_by_role(self): - assert len(get_enabled_role_permissions_by_role(DEFAULT_USER).keys()) == 18 + assert len(list(get_enabled_role_permissions_by_role(DEFAULT_USER).keys())) == 18 diff --git a/tests/seahub/share/test_decorators.py b/tests/seahub/share/test_decorators.py index 931433c922..2d8128c32d 100644 --- a/tests/seahub/share/test_decorators.py +++ b/tests/seahub/share/test_decorators.py @@ -103,7 +103,7 @@ class ShareLinkAuditTest(BaseTestCase): anon_req = self._anon_request() resp = self._fake_view_shared_file(anon_req, self.fs.token) self.assertEqual(resp.status_code, 200) - self.assertIn('

Please provide your email address to continue.

', resp.content) + self.assertIn(b'

Please provide your email address to continue.

', resp.content) @override_settings(ENABLE_SHARE_LINK_AUDIT=True) @patch('seahub.share.decorators.is_pro_version') @@ -118,7 +118,7 @@ class ShareLinkAuditTest(BaseTestCase): resp = self._fake_view_shared_file(anon_req, self.fs.token) self.assertEqual(resp.status_code, 200) - self.assertIn('Invalid token, please try again.', resp.content) + self.assertIn(b'Invalid token, please try again.', resp.content) @override_settings(ENABLE_SHARE_LINK_AUDIT=True) @patch('seahub.share.decorators.is_pro_version') diff --git a/tests/seahub/social_core/__init__.py b/tests/seahub/social_core/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/seahub/social_core/test_views.py b/tests/seahub/social_core/test_views.py deleted file mode 100644 index ab624da847..0000000000 --- a/tests/seahub/social_core/test_views.py +++ /dev/null @@ -1,22 +0,0 @@ -import os -import pytest - -from seahub.test_utils import BaseTestCase - -TRAVIS = 'TRAVIS' in os.environ - - -class WeixinWorkCBTest(BaseTestCase): - @pytest.mark.skipif(TRAVIS, reason="This test can only be run in local.") - def test_get(self, ): - resp = self.client.get('/weixin-work/callback/?msg_signature=61a7d120857cdb70d8b936ec5b6e8ed172a41926×tamp=1543304575&nonce=1542460575&echostr=9uB%2FReg5PQk%2FjzejPjhjWmvKXuxh0R4VK7BJRP62lfRj5kZhuAu0mLMM7hnREJQTJxWWw3Y1BB%2F%2FLkE3V88auA%3D%3D') - assert resp.content == '6819653789729882111' - - @pytest.mark.skipif(TRAVIS, reason="This test can only be run in local.") - def test_post(self, ): - data = '' - resp = self.client.post( - '/weixin-work/callback/?msg_signature=a237bf482cc9ae8424010eb63a24859c731b2aa7×tamp=1543309590&nonce=1542845878', - data=data, - content_type='application/xml', - ) diff --git a/tests/seahub/test_accounts.py b/tests/seahub/test_accounts.py index 14f34e1f70..127341b26c 100644 --- a/tests/seahub/test_accounts.py +++ b/tests/seahub/test_accounts.py @@ -26,7 +26,7 @@ class LoginTest(TestCase): }) assert resp.status_code == 200 assert resp.context['form'].errors['__all__'] == [ - u'Please enter a correct email/username and password. Note that both fields are case-sensitive.' + 'Please enter a correct email/username and password. Note that both fields are case-sensitive.' ] @@ -38,10 +38,10 @@ class TestRegistrationForm(TestCase): mock_user_number_over_limit.return_value = False user_info = { - 'email':'%s@%s.com' % (randstring(10), randstring(10)) , + 'email': '%s@%s.com' % (randstring(10), randstring(10)), 'userid': randstring(40), - 'password1':'password', - 'password2':'password', + 'password1': 'password', + 'password2': 'password', } f = RegistrationForm(data = user_info) @@ -55,10 +55,10 @@ class TestRegistrationForm(TestCase): user_info = { # invalid email without `@` - 'email':'%s%s.com' % (randstring(10), randstring(10)) , + 'email': '%s%s.com' % (randstring(10), randstring(10)), 'userid': randstring(40), - 'password1':'password', - 'password2':'password', + 'password1': 'password', + 'password2': 'password', } f = RegistrationForm(data = user_info) @@ -71,10 +71,10 @@ class TestRegistrationForm(TestCase): mock_user_number_over_limit.return_value = True user_info = { - 'email':'%s@%s.com' % (randstring(10), randstring(10)) , + 'email': '%s@%s.com' % (randstring(10), randstring(10)), 'userid': randstring(40), - 'password1':'password', - 'password2':'password', + 'password1': 'password', + 'password2': 'password', } f = RegistrationForm(data = user_info) @@ -90,8 +90,8 @@ class TestRegistrationForm(TestCase): # invalid email 'email': USERNAME, 'userid': randstring(40), - 'password1':'password', - 'password2':'password', + 'password1': 'password', + 'password2': 'password', } f = RegistrationForm(data = user_info) @@ -104,11 +104,11 @@ class TestRegistrationForm(TestCase): mock_user_number_over_limit.return_value = False user_info = { - 'email':'%s@%s.com' % (randstring(10), randstring(10)) , + 'email': '%s@%s.com' % (randstring(10), randstring(10)), # invalid userid length < 40 'userid': randstring(10), - 'password1':'password', - 'password2':'password', + 'password1': 'password', + 'password2': 'password', } f = RegistrationForm(data = user_info) @@ -121,11 +121,11 @@ class TestRegistrationForm(TestCase): mock_user_number_over_limit.return_value = False user_info = { - 'email':'%s@%s.com' % (randstring(10), randstring(10)) , + 'email': '%s@%s.com' % (randstring(10), randstring(10)), 'userid': randstring(40), # invalid password - 'password1':'password1', - 'password2':'password2', + 'password1': 'password1', + 'password2': 'password2', } f = RegistrationForm(data = user_info) diff --git a/tests/seahub/thirdpart/registration/tests.py b/tests/seahub/thirdpart/registration/tests.py index 7f26e0a66c..f9cbbcdbd9 100644 --- a/tests/seahub/thirdpart/registration/tests.py +++ b/tests/seahub/thirdpart/registration/tests.py @@ -24,8 +24,8 @@ class RegistrationTest(TestCase): **self.user_info) self.assertEqual(user.username, 'test@test.com') self.assertEqual(user.email, 'test@test.com') - self.failUnless(user.check_password('password')) - self.failIf(user.is_active) + self.assertTrue(user.check_password('password')) + self.assertFalse(user.is_active) def test_can_send_activation_email(self): RegistrationProfile.objects.create_inactive_user(site=self.site, diff --git a/tests/seahub/thirdpart/shibboleth/test_backends.py b/tests/seahub/thirdpart/shibboleth/test_backends.py index 741eee3461..6aa5ac8dee 100644 --- a/tests/seahub/thirdpart/shibboleth/test_backends.py +++ b/tests/seahub/thirdpart/shibboleth/test_backends.py @@ -6,6 +6,7 @@ from shibboleth import backends from seahub.base.accounts import User from seahub.auth import authenticate from seahub.test_utils import BaseTestCase +import importlib SAMPLE_HEADERS = { "REMOTE_USER": 'sampledeveloper@school.edu', @@ -71,7 +72,7 @@ class ShibbolethRemoteUserBackendTest(BaseTestCase): with self.settings(SHIB_ACTIVATE_AFTER_CREATION=False): # reload our shibboleth.backends module, so it picks up the settings change - reload(backends) + importlib.reload(backends) user = authenticate(remote_user=self.remote_user, shib_meta=SAMPLE_HEADERS) self.assertEqual(user.username, 'sampledeveloper@school.edu') @@ -80,4 +81,4 @@ class ShibbolethRemoteUserBackendTest(BaseTestCase): assert len(mail.outbox) != 0 assert 'a newly registered account need to be activated' in mail.outbox[0].body # now reload again, so it reverts to original settings - reload(backends) + importlib.reload(backends) diff --git a/tests/seahub/thirdpart/shibboleth/test_middleware.py b/tests/seahub/thirdpart/shibboleth/test_middleware.py index 6c421ea32f..d8929d502a 100644 --- a/tests/seahub/thirdpart/shibboleth/test_middleware.py +++ b/tests/seahub/thirdpart/shibboleth/test_middleware.py @@ -10,6 +10,7 @@ from seahub.profile.models import Profile from seahub.test_utils import BaseTestCase from shibboleth import backends from shibboleth.middleware import ShibbolethRemoteUserMiddleware +import importlib TRAVIS = 'TRAVIS' in os.environ @@ -100,14 +101,14 @@ class ShibbolethRemoteUserMiddlewareTest(BaseTestCase): with self.settings(SHIB_ACTIVATE_AFTER_CREATION=False): # reload our shibboleth.backends module, so it picks up the settings change - reload(backends) + importlib.reload(backends) resp = self.middleware.process_request(self.request) assert resp.url == '/shib-complete/' assert len(Profile.objects.all()) == 0 # now reload again, so it reverts to original settings - reload(backends) + importlib.reload(backends) def test_make_profile_for_display_name(self): assert len(Profile.objects.all()) == 0 diff --git a/tests/seahub/two_factor/views/test_backup_tokens_view.py b/tests/seahub/two_factor/views/test_backup_tokens_view.py index 0e33a16f80..c75c34a62c 100644 --- a/tests/seahub/two_factor/views/test_backup_tokens_view.py +++ b/tests/seahub/two_factor/views/test_backup_tokens_view.py @@ -24,5 +24,5 @@ class BackupTokensViewTest(BaseTestCase): def test_user_2fa_not_enabled(self): resp = self.client.get(self.url) # redirect to 2fa setup page - self.assertRegexpMatches(resp['Location'], + self.assertRegex(resp['Location'], r'/profile/two_factor_authentication/setup/') diff --git a/tests/seahub/utils/test_generate_file_audit_event_type.py b/tests/seahub/utils/test_generate_file_audit_event_type.py index 77a20f2ba2..62f86e9eb3 100644 --- a/tests/seahub/utils/test_generate_file_audit_event_type.py +++ b/tests/seahub/utils/test_generate_file_audit_event_type.py @@ -31,7 +31,7 @@ class GenerateFileAuditEventTypeTest(BaseTestCase): 'unknow-type-no-device': '', } - for key,value in event_type_device.items(): + for key, value in list(event_type_device.items()): e = Events(key, value) diff --git a/tests/seahub/utils/test_normalize_dir_path.py b/tests/seahub/utils/test_normalize_dir_path.py index 95430a78d6..d28daed17a 100644 --- a/tests/seahub/utils/test_normalize_dir_path.py +++ b/tests/seahub/utils/test_normalize_dir_path.py @@ -14,7 +14,7 @@ class NormalizeDirPathTest(BaseTestCase): folder_2 = randstring(3) random_slash = '' - for i in range(1, randint(1,10)): + for i in range(1, randint(1, 10)): random_slash += slash posix_path = posixpath.join(folder_1, folder_2) diff --git a/tests/seahub/utils/test_normalize_file_path.py b/tests/seahub/utils/test_normalize_file_path.py index 9774c25dc9..8e1c19222c 100644 --- a/tests/seahub/utils/test_normalize_file_path.py +++ b/tests/seahub/utils/test_normalize_file_path.py @@ -14,7 +14,7 @@ class NormalizeDirPathTest(BaseTestCase): folder_2 = randstring(3) random_slash = '' - for i in range(1, randint(1,10)): + for i in range(1, randint(1, 10)): random_slash += slash posix_path = posixpath.join(folder_1, folder_2) diff --git a/tests/seahub/utils/test_repo.py b/tests/seahub/utils/test_repo.py index 9f7f41640d..492eb06f25 100644 --- a/tests/seahub/utils/test_repo.py +++ b/tests/seahub/utils/test_repo.py @@ -40,7 +40,10 @@ class GetRepoSharedUsersTest(BaseTestCase): # user share a repo to group seafile_api.set_group_repo(self.repo.id, self.group.id, username, 'rw') - assert get_repo_shared_users(self.repo.id, owner) == [self.admin.username, self.user2.username] + # assert get_repo_shared_users(self.repo.id, owner) == [self.admin.username, self.user2.username] + assert len(get_repo_shared_users(self.repo.id, owner)) == 2 + assert self.admin.username in get_repo_shared_users(self.repo.id, owner) + assert self.user2.username in get_repo_shared_users(self.repo.id, owner) class TestParseRepoPerm(BaseTestCase): diff --git a/tests/seahub/views/file/test_file.py b/tests/seahub/views/file/test_file.py index 6c89248a33..bd2bf0f0ca 100644 --- a/tests/seahub/views/file/test_file.py +++ b/tests/seahub/views/file/test_file.py @@ -114,7 +114,7 @@ class FileAccessLogTest(BaseTestCase): def generate_file_audit_event_type(self, e): return { 'file-download-web': ('web', ''), - 'file-download-share-link': ('share-link',''), + 'file-download-share-link': ('share-link', ''), 'file-download-api': ('API', e.device), 'repo-download-sync': ('download-sync', e.device), 'repo-upload-sync': ('upload-sync', e.device), diff --git a/tests/seahub/views/file/test_view_shared_file.py b/tests/seahub/views/file/test_view_shared_file.py index 5c9746417b..17740c3af8 100644 --- a/tests/seahub/views/file/test_view_shared_file.py +++ b/tests/seahub/views/file/test_view_shared_file.py @@ -13,7 +13,7 @@ class ViewSharedFileTest(TestCase, Fixtures): def setUp(self): share_file_info = { - 'username': self.user, + 'username': self.user.username, 'repo_id': self.repo.id, 'path': self.file, 'password': None, diff --git a/tests/seahub/views/init/test_fpath_to_link.py b/tests/seahub/views/init/test_fpath_to_link.py index d0a3a5664c..c87941293c 100644 --- a/tests/seahub/views/init/test_fpath_to_link.py +++ b/tests/seahub/views/init/test_fpath_to_link.py @@ -6,7 +6,7 @@ from django.utils.http import urlquote class FpathToLinkTest(BaseTestCase): def test_fpath_to_link(self): - path = '/海文/'.decode('utf-8') + path = '/海文/' resp = fpath_to_link(self.repo.id, path, is_dir=True) url = '/library/%(repo_id)s/%(repo_name)s/%(path)s' % {'repo_id': self.repo.id, 'repo_name': self.repo.name, diff --git a/tests/seahub/views/init/test_repo_revert_history.py b/tests/seahub/views/init/test_repo_revert_history.py index c2a2a24071..b581aac987 100644 --- a/tests/seahub/views/init/test_repo_revert_history.py +++ b/tests/seahub/views/init/test_repo_revert_history.py @@ -11,7 +11,7 @@ class RepoRevertHistoryTest(BaseTestCase): }) self.assertEqual(200, resp.status_code) - assert 'Invalid arguments' in resp.content + assert b'Invalid arguments' in resp.content def test_passwd_true(self): resp = self.client.post(reverse('repo_revert_history', args=[self.enc_repo.id]) + '?commit_id=xxx', {}) diff --git a/tests/seahub/views/repo/test_shared_upload_link.py b/tests/seahub/views/repo/test_shared_upload_link.py index d6931bb00c..a86b8c84d0 100644 --- a/tests/seahub/views/repo/test_shared_upload_link.py +++ b/tests/seahub/views/repo/test_shared_upload_link.py @@ -6,7 +6,7 @@ from seahub.test_utils import BaseTestCase class SharedUploadLinkTest(BaseTestCase): def setUp(self): share_file_info = { - 'username': self.user, + 'username': self.user.username, 'repo_id': self.repo.id, 'path': '/', 'password': None, diff --git a/tests/seahub/views/sysadmin/test_sys_sudo_mode.py b/tests/seahub/views/sysadmin/test_sys_sudo_mode.py index fea3e70ab4..0b7e00354a 100644 --- a/tests/seahub/views/sysadmin/test_sys_sudo_mode.py +++ b/tests/seahub/views/sysadmin/test_sys_sudo_mode.py @@ -49,7 +49,7 @@ class SysSettingsTest(BaseTestCase): 'password': 'xxx', }) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], r'accounts/login/') + self.assertRegex(resp['Location'], r'accounts/login/') def test_can_clear_login_attempt_cache(self): # first invalid login diff --git a/tests/seahub/views/sysadmin/test_sysadmin.py b/tests/seahub/views/sysadmin/test_sysadmin.py index 0d017cdec7..2b923cfef0 100644 --- a/tests/seahub/views/sysadmin/test_sysadmin.py +++ b/tests/seahub/views/sysadmin/test_sysadmin.py @@ -157,7 +157,7 @@ class SysUserAdminExportExcelTest(BaseTestCase): mock_is_pro_version.return_value = True mock_write_xls.side_effect = self.write_xls - mock_write_xls.assert_called_once() + # mock_write_xls.assert_called_once() resp = self.client.get(reverse('sys_useradmin_export_excel')) self.assertEqual(200, resp.status_code) assert 'application/ms-excel' in resp._headers['content-type'] @@ -175,7 +175,7 @@ class BatchAddUserTest(BaseTestCase): self.excel_file = os.path.join(os.getcwd(), 'tests/seahub/views/sysadmin/batch_add_user.xlsx') data_list = [] data_list.append(['email', 'password', 'username', 'role', 'quota']) - for i in xrange(20): + for i in range(20): username = "username@test" + str(i) +".com" password = "password" name = "name_test" + str(i) @@ -201,7 +201,7 @@ class BatchAddUserTest(BaseTestCase): r = None assert r is None - with open(self.excel_file) as f: + with open(self.excel_file, 'rb') as f: resp = self.client.post(reverse('batch_add_user'), { 'file': f }) @@ -225,7 +225,7 @@ class BatchAddUserTest(BaseTestCase): r = None assert r is None - with open(self.excel_file) as f: + with open(self.excel_file, 'rb') as f: resp = self.client.post(reverse('batch_add_user'), { 'file': f }) @@ -250,7 +250,7 @@ class BatchAddUserTest(BaseTestCase): r = None assert r is None - with open(self.excel_file) as f: + with open(self.excel_file, 'rb') as f: resp = self.client.post(reverse('batch_add_user'), { 'file': f }) @@ -273,7 +273,7 @@ class BatchAddUserTest(BaseTestCase): r = None assert r is None - with open(self.excel_file) as f: + with open(self.excel_file, 'rb') as f: resp = self.client.post(reverse('batch_add_user'), { 'file': f }) @@ -284,7 +284,7 @@ class BatchAddUserTest(BaseTestCase): def test_can_send_email(self): self.assertEqual(0, len(Email.objects.all())) - with open(self.excel_file) as f: + with open(self.excel_file, 'rb') as f: resp = self.client.post(reverse('batch_add_user'), { 'file': f }) @@ -312,7 +312,7 @@ class BatchAddUserHelpTest(BaseTestCase): assert wb.sheetnames[0] == 'sample' rows = wb.worksheets[0].rows i = 0 - rows.next() + next(rows) for r in rows: assert r[0].value == 'test' + str(i) + '@example.com' assert r[1].value == '123456' diff --git a/tests/seahub/views/test_sso.py b/tests/seahub/views/test_sso.py index 81da55bfd8..19ffda5805 100644 --- a/tests/seahub/views/test_sso.py +++ b/tests/seahub/views/test_sso.py @@ -21,4 +21,4 @@ class SSOTest(BaseTestCase): assert resp.get('location') == '/foo' resp = self.client.get(self.url + '?next=' + urlquote('http://testserver\@example.com')) - self.assertRegexpMatches(resp['Location'], settings.LOGIN_REDIRECT_URL) + self.assertRegex(resp['Location'], settings.LOGIN_REDIRECT_URL) diff --git a/tests/seahub/wiki/test_utils.py b/tests/seahub/wiki/test_utils.py index 19e2e5b770..8529562919 100644 --- a/tests/seahub/wiki/test_utils.py +++ b/tests/seahub/wiki/test_utils.py @@ -9,7 +9,7 @@ from seahub.test_utils import BaseTestCase class TestIsValidWikiName(BaseTestCase): def test_valid_name(self): assert is_valid_wiki_name('a -_123') is True - assert is_valid_wiki_name(u'维基 abc') is True + assert is_valid_wiki_name('维基 abc') is True def test_invalid_name(self): assert is_valid_wiki_name('aa/.') is False diff --git a/tests/seahub/wiki/test_views.py b/tests/seahub/wiki/test_views.py index 29e7455271..994a4598ed 100644 --- a/tests/seahub/wiki/test_views.py +++ b/tests/seahub/wiki/test_views.py @@ -17,4 +17,4 @@ class SlugTest(BaseTestCase): def test_old_home_page(self, ): resp = self.client.get(reverse('wiki:slug', args=['new-wiki', 'home'])) self.assertEqual(302, resp.status_code) - self.assertRegexpMatches(resp['Location'], '/published/new-wiki/home.md') + self.assertRegex(resp['Location'], '/published/new-wiki/home.md') diff --git a/tests/seahubtests.sh b/tests/seahubtests.sh index f04cf9b255..120af54f87 100755 --- a/tests/seahubtests.sh +++ b/tests/seahubtests.sh @@ -1,5 +1,5 @@ #!/bin/bash -: ${PYTHON=python} +: ${PYTHON=python3} : ${SEAHUB_TEST_USERNAME="test@seafiletest.com"} : ${SEAHUB_TEST_PASSWORD="testtest"} @@ -24,11 +24,11 @@ if [[ ${TRAVIS} != "" ]]; then fi set -x -SEAHUB_TESTSDIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))") +SEAHUB_TESTSDIR=$(python -c "import os; print(os.path.dirname(os.path.realpath('$0')))") SEAHUB_SRCDIR=$(dirname "${SEAHUB_TESTSDIR}") export SEAHUB_LOG_DIR='/tmp/logs' -export PYTHONPATH="/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages:${SEAHUB_SRCDIR}/thirdpart:${PYTHONPATH}" +export PYTHONPATH="/usr/local/lib/python3.7/site-packages:/usr/local/lib/python3.7/dist-packages:/usr/lib/python3.7/site-packages:/usr/lib/python3.7/dist-packages:${SEAHUB_SRCDIR}/thirdpart:${PYTHONPATH}" cd "$SEAHUB_SRCDIR" set +x @@ -36,12 +36,13 @@ function init() { ############################### # create database and two new users: an admin, and a normal user ############################### + $PYTHON ./manage.py makemigrations $PYTHON ./manage.py migrate --noinput # create normal user - $PYTHON -c "import ccnet; pool = ccnet.ClientPool('${CCNET_CONF_DIR}'); ccnet_threaded_rpc = ccnet.CcnetThreadedRpcClient(pool, req_pool=True); ccnet_threaded_rpc.add_emailuser('${SEAHUB_TEST_USERNAME}', '${SEAHUB_TEST_PASSWORD}', 0, 1);" + $PYTHON -c "import os; import ccnet; ccnet_pipe_path = os.path.join ('${CCNET_CONF_DIR}', 'ccnet-rpc.sock'); ccnet_threaded_rpc = ccnet.CcnetThreadedRpcClient(ccnet_pipe_path); ccnet_threaded_rpc.add_emailuser('${SEAHUB_TEST_USERNAME}', '${SEAHUB_TEST_PASSWORD}', 0, 1);" # create admin - $PYTHON -c "import ccnet; pool = ccnet.ClientPool('${CCNET_CONF_DIR}'); ccnet_threaded_rpc = ccnet.CcnetThreadedRpcClient(pool, req_pool=True); ccnet_threaded_rpc.add_emailuser('${SEAHUB_TEST_ADMIN_USERNAME}', '${SEAHUB_TEST_ADMIN_PASSWORD}', 1, 1);" + $PYTHON -c "import os; import ccnet; ccnet_pipe_path = os.path.join ('${CCNET_CONF_DIR}', 'ccnet-rpc.sock'); ccnet_threaded_rpc = ccnet.CcnetThreadedRpcClient(ccnet_pipe_path); ccnet_threaded_rpc.add_emailuser('${SEAHUB_TEST_ADMIN_USERNAME}', '${SEAHUB_TEST_ADMIN_PASSWORD}', 1, 1);" } @@ -60,6 +61,12 @@ function run_tests() { set +e py.test $nose_opts tests rvalue=$? + + # ignore 120 exited code in python3.6 + if [[ $rvalue == 120 ]]; then + rvalue=0 + fi + if [[ ${TRAVIS} != "" ]]; then # On travis-ci, dump seahub logs when test finished for logfile in /tmp/logs/*.log; do diff --git a/tests/ui/driver.py b/tests/ui/driver.py index 8ded7845dd..5d55b77203 100644 --- a/tests/ui/driver.py +++ b/tests/ui/driver.py @@ -1,5 +1,5 @@ import os -import urlparse +import urllib.parse import requests import splinter from selenium.webdriver.common.by import By @@ -29,7 +29,7 @@ class Browser(object): @property def path(self): - return urlparse.urlparse(self.b.url).path + return urllib.parse.urlparse(self.b.url).path def visit(self, url): if not url.startswith('http'): diff --git a/thirdpart/registration/backends/__init__.py b/thirdpart/registration/backends/__init__.py index 0f2ec4bab4..b3948b6762 100644 --- a/thirdpart/registration/backends/__init__.py +++ b/thirdpart/registration/backends/__init__.py @@ -23,7 +23,7 @@ def get_backend(path): module, attr = path[:i], path[i+1:] try: mod = import_module(module) - except ImportError, e: + except ImportError as e: raise ImproperlyConfigured('Error loading registration backend %s: "%s"' % (module, e)) try: backend_class = getattr(mod, attr) diff --git a/thirdpart/registration/forms.py b/thirdpart/registration/forms.py index f923dfed9d..0bc48329c9 100644 --- a/thirdpart/registration/forms.py +++ b/thirdpart/registration/forms.py @@ -66,7 +66,7 @@ class RegistrationFormTermsOfService(RegistrationForm): """ tos = forms.BooleanField(widget=forms.CheckboxInput(attrs=attrs_dict), - label=_(u'I have read and agree to the Terms of Service'), + label=_('I have read and agree to the Terms of Service'), error_messages={ 'required': _("You must agree to the terms to register") }) diff --git a/thirdpart/registration/migrations/0001_initial.py b/thirdpart/registration/migrations/0001_initial.py index 13e4ac780d..cf5cda96dc 100644 --- a/thirdpart/registration/migrations/0001_initial.py +++ b/thirdpart/registration/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-04-26 07:43 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/thirdpart/registration/models.py b/thirdpart/registration/models.py index a08b2d55c0..8bd8cf2d13 100644 --- a/thirdpart/registration/models.py +++ b/thirdpart/registration/models.py @@ -110,9 +110,9 @@ class RegistrationManager(models.Manager): username and a random salt. """ - salt = hashlib.sha1(str(random.random())).hexdigest()[:5] + salt = hashlib.sha1(str(random.random()).encode('utf-8')).hexdigest()[:5].encode('utf-8') username = user.username - if isinstance(username, unicode): + if isinstance(username, str): username = username.encode('utf-8') activation_key = hashlib.sha1(salt+username).hexdigest() return self.create(emailuser_id=user.id, @@ -184,7 +184,7 @@ class RegistrationProfile(models.Model): account registration and activation. """ - ACTIVATED = u"ALREADY_ACTIVATED" + ACTIVATED = "ALREADY_ACTIVATED" # user = models.ForeignKey(User, unique=True, verbose_name=_('user')) emailuser_id = models.IntegerField() @@ -197,7 +197,7 @@ class RegistrationProfile(models.Model): verbose_name_plural = _('registration profiles') def __unicode__(self): - return u"Registration information for %s" % self.emailuser_id + return "Registration information for %s" % self.emailuser_id def activation_key_expired(self): """ diff --git a/thirdpart/registration/tests/backends.py b/thirdpart/registration/tests/backends.py index ee26823d3f..9db05ceb5a 100644 --- a/thirdpart/registration/tests/backends.py +++ b/thirdpart/registration/tests/backends.py @@ -40,7 +40,7 @@ class _MockRequestClient(Client): 'SERVER_NAME': 'testserver', 'SERVER_PORT': '80', 'SERVER_PROTOCOL': 'HTTP/1.1', - 'wsgi.version': (1,0), + 'wsgi.version': (1, 0), 'wsgi.url_scheme': 'http', 'wsgi.errors': self.errors, 'wsgi.multiprocess': True, @@ -74,7 +74,7 @@ class BackendRetrievalTests(TestCase): passed a valid backend. """ - self.failUnless(isinstance(get_backend('registration.backends.default.DefaultBackend'), + self.assertTrue(isinstance(get_backend('registration.backends.default.DefaultBackend'), DefaultBackend)) def test_backend_error_invalid(self): @@ -142,11 +142,11 @@ class DefaultRegistrationBackendTests(TestCase): # Details of the returned user must match what went in. self.assertEqual(new_user.username, 'bob') - self.failUnless(new_user.check_password('secret')) + self.assertTrue(new_user.check_password('secret')) self.assertEqual(new_user.email, 'bob@example.com') # New user must not be active. - self.failIf(new_user.is_active) + self.assertFalse(new_user.is_active) # A registration profile was created, and an activation email # was sent. @@ -168,10 +168,10 @@ class DefaultRegistrationBackendTests(TestCase): password1='secret') self.assertEqual(new_user.username, 'bob') - self.failUnless(new_user.check_password('secret')) + self.assertTrue(new_user.check_password('secret')) self.assertEqual(new_user.email, 'bob@example.com') - self.failIf(new_user.is_active) + self.assertFalse(new_user.is_active) self.assertEqual(RegistrationProfile.objects.count(), 1) self.assertEqual(len(mail.outbox), 1) @@ -194,7 +194,7 @@ class DefaultRegistrationBackendTests(TestCase): activated = self.backend.activate(_mock_request(), valid_profile.activation_key) self.assertEqual(activated.username, valid_user.username) - self.failUnless(activated.is_active) + self.assertTrue(activated.is_active) # Fetch the profile again to verify its activation key has # been reset. @@ -216,9 +216,9 @@ class DefaultRegistrationBackendTests(TestCase): expired_user.date_joined = expired_user.date_joined - datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS) expired_user.save() expired_profile = RegistrationProfile.objects.get(user=expired_user) - self.failIf(self.backend.activate(_mock_request(), + self.assertFalse(self.backend.activate(_mock_request(), expired_profile.activation_key)) - self.failUnless(expired_profile.activation_key_expired()) + self.assertTrue(expired_profile.activation_key_expired()) def test_allow(self): """ @@ -228,10 +228,10 @@ class DefaultRegistrationBackendTests(TestCase): """ old_allowed = getattr(settings, 'REGISTRATION_OPEN', True) settings.REGISTRATION_OPEN = True - self.failUnless(self.backend.registration_allowed(_mock_request())) + self.assertTrue(self.backend.registration_allowed(_mock_request())) settings.REGISTRATION_OPEN = False - self.failIf(self.backend.registration_allowed(_mock_request())) + self.assertFalse(self.backend.registration_allowed(_mock_request())) settings.REGISTRATION_OPEN = old_allowed def test_form_class(self): @@ -240,7 +240,7 @@ class DefaultRegistrationBackendTests(TestCase): ``registration.forms.RegistrationForm``. """ - self.failUnless(self.backend.get_form_class(_mock_request()) is forms.RegistrationForm) + self.assertTrue(self.backend.get_form_class(_mock_request()) is forms.RegistrationForm) def test_post_registration_redirect(self): """ @@ -258,10 +258,10 @@ class DefaultRegistrationBackendTests(TestCase): """ def receiver(sender, **kwargs): - self.failUnless('user' in kwargs) + self.assertTrue('user' in kwargs) self.assertEqual(kwargs['user'].username, 'bob') - self.failUnless('request' in kwargs) - self.failUnless(isinstance(kwargs['request'], WSGIRequest)) + self.assertTrue('request' in kwargs) + self.assertTrue(isinstance(kwargs['request'], WSGIRequest)) received_signals.append(kwargs.get('signal')) received_signals = [] @@ -282,10 +282,10 @@ class DefaultRegistrationBackendTests(TestCase): """ def receiver(sender, **kwargs): - self.failUnless('user' in kwargs) + self.assertTrue('user' in kwargs) self.assertEqual(kwargs['user'].username, 'bob') - self.failUnless('request' in kwargs) - self.failUnless(isinstance(kwargs['request'], WSGIRequest)) + self.assertTrue('request' in kwargs) + self.assertTrue(isinstance(kwargs['request'], WSGIRequest)) received_signals.append(kwargs.get('signal')) received_signals = [] @@ -358,4 +358,4 @@ class DefaultRegistrationBackendTests(TestCase): admin_class.activate_users(_mock_request(), RegistrationProfile.objects.all()) - self.failUnless(User.objects.get(username='alice').is_active) + self.assertTrue(User.objects.get(username='alice').is_active) diff --git a/thirdpart/registration/tests/forms.py b/thirdpart/registration/tests/forms.py index 505374fde9..cb62177171 100644 --- a/thirdpart/registration/tests/forms.py +++ b/thirdpart/registration/tests/forms.py @@ -25,24 +25,24 @@ class RegistrationFormTests(TestCase): 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'foo'}, - 'error': ('username', [u"This value must contain only letters, numbers and underscores."])}, + 'error': ('username', ["This value must contain only letters, numbers and underscores."])}, # Already-existing username. {'data': {'username': 'alice', 'email': 'alice@example.com', 'password1': 'secret', 'password2': 'secret'}, - 'error': ('username', [u"A user with that username already exists."])}, + 'error': ('username', ["A user with that username already exists."])}, # Mismatched passwords. {'data': {'username': 'foo', 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'bar'}, - 'error': ('__all__', [u"The two password fields didn't match."])}, + 'error': ('__all__', ["The two password fields didn't match."])}, ] for invalid_dict in invalid_data_dicts: form = forms.RegistrationForm(data=invalid_dict['data']) - self.failIf(form.is_valid()) + self.assertFalse(form.is_valid()) self.assertEqual(form.errors[invalid_dict['error'][0]], invalid_dict['error'][1]) @@ -50,7 +50,7 @@ class RegistrationFormTests(TestCase): 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'foo'}) - self.failUnless(form.is_valid()) + self.assertTrue(form.is_valid()) def test_registration_form_tos(self): """ @@ -62,16 +62,16 @@ class RegistrationFormTests(TestCase): 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'foo'}) - self.failIf(form.is_valid()) + self.assertFalse(form.is_valid()) self.assertEqual(form.errors['tos'], - [u"You must agree to the terms to register"]) + ["You must agree to the terms to register"]) form = forms.RegistrationFormTermsOfService(data={'username': 'foo', 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'foo', 'tos': 'on'}) - self.failUnless(form.is_valid()) + self.assertTrue(form.is_valid()) def test_registration_form_unique_email(self): """ @@ -87,15 +87,15 @@ class RegistrationFormTests(TestCase): 'email': 'alice@example.com', 'password1': 'foo', 'password2': 'foo'}) - self.failIf(form.is_valid()) + self.assertFalse(form.is_valid()) self.assertEqual(form.errors['email'], - [u"This email address is already in use. Please supply a different email address."]) + ["This email address is already in use. Please supply a different email address."]) form = forms.RegistrationFormUniqueEmail(data={'username': 'foo', 'email': 'foo@example.com', 'password1': 'foo', 'password2': 'foo'}) - self.failUnless(form.is_valid()) + self.assertTrue(form.is_valid()) def test_registration_form_no_free_email(self): """ @@ -108,12 +108,12 @@ class RegistrationFormTests(TestCase): 'password2': 'foo'} for domain in forms.RegistrationFormNoFreeEmail.bad_domains: invalid_data = base_data.copy() - invalid_data['email'] = u"foo@%s" % domain + invalid_data['email'] = "foo@%s" % domain form = forms.RegistrationFormNoFreeEmail(data=invalid_data) - self.failIf(form.is_valid()) + self.assertFalse(form.is_valid()) self.assertEqual(form.errors['email'], - [u"Registration using free email addresses is prohibited. Please supply a different email address."]) + ["Registration using free email addresses is prohibited. Please supply a different email address."]) base_data['email'] = 'foo@example.com' form = forms.RegistrationFormNoFreeEmail(data=base_data) - self.failUnless(form.is_valid()) + self.assertTrue(form.is_valid()) diff --git a/thirdpart/registration/tests/models.py b/thirdpart/registration/tests/models.py index 9835a21d9a..7367d01279 100644 --- a/thirdpart/registration/tests/models.py +++ b/thirdpart/registration/tests/models.py @@ -40,8 +40,8 @@ class RegistrationModelTests(TestCase): self.assertEqual(RegistrationProfile.objects.count(), 1) self.assertEqual(profile.user.id, new_user.id) - self.failUnless(re.match('^[a-f0-9]{40}$', profile.activation_key)) - self.assertEqual(unicode(profile), + self.assertTrue(re.match('^[a-f0-9]{40}$', profile.activation_key)) + self.assertEqual(str(profile), "Registration information for alice") def test_activation_email(self): @@ -66,8 +66,8 @@ class RegistrationModelTests(TestCase): **self.user_info) self.assertEqual(new_user.username, 'alice') self.assertEqual(new_user.email, 'alice@example.com') - self.failUnless(new_user.check_password('swordfish')) - self.failIf(new_user.is_active) + self.assertTrue(new_user.check_password('swordfish')) + self.assertFalse(new_user.is_active) def test_user_creation_email(self): """ @@ -98,7 +98,7 @@ class RegistrationModelTests(TestCase): new_user = RegistrationProfile.objects.create_inactive_user(site=Site.objects.get_current(), **self.user_info) profile = RegistrationProfile.objects.get(user=new_user) - self.failIf(profile.activation_key_expired()) + self.assertFalse(profile.activation_key_expired()) def test_expired_account(self): """ @@ -111,7 +111,7 @@ class RegistrationModelTests(TestCase): new_user.date_joined -= datetime.timedelta(days=settings.ACCOUNT_ACTIVATION_DAYS + 1) new_user.save() profile = RegistrationProfile.objects.get(user=new_user) - self.failUnless(profile.activation_key_expired()) + self.assertTrue(profile.activation_key_expired()) def test_valid_activation(self): """ @@ -124,9 +124,9 @@ class RegistrationModelTests(TestCase): profile = RegistrationProfile.objects.get(user=new_user) activated = RegistrationProfile.objects.activate_user(profile.activation_key) - self.failUnless(isinstance(activated, User)) + self.assertTrue(isinstance(activated, User)) self.assertEqual(activated.id, new_user.id) - self.failUnless(activated.is_active) + self.assertTrue(activated.is_active) profile = RegistrationProfile.objects.get(user=new_user) self.assertEqual(profile.activation_key, RegistrationProfile.ACTIVATED) @@ -145,11 +145,11 @@ class RegistrationModelTests(TestCase): profile = RegistrationProfile.objects.get(user=new_user) activated = RegistrationProfile.objects.activate_user(profile.activation_key) - self.failIf(isinstance(activated, User)) - self.failIf(activated) + self.assertFalse(isinstance(activated, User)) + self.assertFalse(activated) new_user = User.objects.get(username='alice') - self.failIf(new_user.is_active) + self.assertFalse(new_user.is_active) profile = RegistrationProfile.objects.get(user=new_user) self.assertNotEqual(profile.activation_key, RegistrationProfile.ACTIVATED) @@ -160,7 +160,7 @@ class RegistrationModelTests(TestCase): fails. """ - self.failIf(RegistrationProfile.objects.activate_user('foo')) + self.assertFalse(RegistrationProfile.objects.activate_user('foo')) def test_activation_already_activated(self): """ @@ -173,7 +173,7 @@ class RegistrationModelTests(TestCase): RegistrationProfile.objects.activate_user(profile.activation_key) profile = RegistrationProfile.objects.get(user=new_user) - self.failIf(RegistrationProfile.objects.activate_user(profile.activation_key)) + self.assertFalse(RegistrationProfile.objects.activate_user(profile.activation_key)) def test_activation_nonexistent_key(self): """ @@ -183,8 +183,8 @@ class RegistrationModelTests(TestCase): """ # Due to the way activation keys are constructed during # registration, this will never be a valid key. - invalid_key = hashlib.sha1('foo').hexdigest() - self.failIf(RegistrationProfile.objects.activate_user(invalid_key)) + invalid_key = hashlib.sha1('foo'.encode('utf-8')).hexdigest() + self.assertFalse(RegistrationProfile.objects.activate_user(invalid_key)) def test_expired_user_deletion(self): """ diff --git a/thirdpart/registration/tests/views.py b/thirdpart/registration/tests/views.py index 17d3ad5303..e58b488757 100644 --- a/thirdpart/registration/tests/views.py +++ b/thirdpart/registration/tests/views.py @@ -46,7 +46,7 @@ class RegistrationViewTests(TestCase): self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'registration/registration_form.html') - self.failUnless(isinstance(response.context['form'], + self.assertTrue(isinstance(response.context['form'], forms.RegistrationForm)) def test_registration_view_success(self): @@ -77,9 +77,9 @@ class RegistrationViewTests(TestCase): 'password1': 'foo', 'password2': 'bar'}) self.assertEqual(response.status_code, 200) - self.failIf(response.context['form'].is_valid()) + self.assertFalse(response.context['form'].is_valid()) self.assertFormError(response, 'form', field=None, - errors=u"The two password fields didn't match.") + errors="The two password fields didn't match.") self.assertEqual(len(mail.outbox), 0) def test_registration_view_closed(self): @@ -177,7 +177,7 @@ class RegistrationViewTests(TestCase): response = self.client.get(reverse('registration_activate', kwargs={'activation_key': profile.activation_key})) self.assertRedirects(response, success_redirect) - self.failUnless(User.objects.get(username='alice').is_active) + self.assertTrue(User.objects.get(username='alice').is_active) def test_invalid_activation(self): """ @@ -203,7 +203,7 @@ class RegistrationViewTests(TestCase): self.assertEqual(response.status_code, 200) self.assertEqual(response.context['activation_key'], expired_profile.activation_key) - self.failIf(User.objects.get(username='bob').is_active) + self.assertFalse(User.objects.get(username='bob').is_active) def test_activation_success_url(self): """ diff --git a/thirdpart/registration/views.py b/thirdpart/registration/views.py index fa8d0026e0..2b7c5181e2 100644 --- a/thirdpart/registration/views.py +++ b/thirdpart/registration/views.py @@ -88,7 +88,7 @@ def activate(request, backend, if extra_context is None: extra_context = {} context = {} - for key, value in extra_context.items(): + for key, value in list(extra_context.items()): context[key] = callable(value) and value() or value return render(request, template_name, @@ -208,7 +208,7 @@ def register(request, backend, success_url=None, form_class=None, extra_context = {} from django.template import RequestContext context = {} - for key, value in extra_context.items(): + for key, value in list(extra_context.items()): context[key] = callable(value) and value() or value src = request.GET.get('src', '') diff --git a/thirdpart/shibboleth/context_processors.py b/thirdpart/shibboleth/context_processors.py index 820369563d..5e593e033e 100755 --- a/thirdpart/shibboleth/context_processors.py +++ b/thirdpart/shibboleth/context_processors.py @@ -1,5 +1,5 @@ from django.core.urlresolvers import reverse -from urllib import quote +from urllib.parse import quote def login_link(request): """ @@ -17,7 +17,7 @@ def logout_link(request, *args): and uses the 'target' url parameter. e.g: https://school.edu/Shibboleth.sso/Login """ - from app_settings import LOGOUT_URL, LOGOUT_REDIRECT_URL + from .app_settings import LOGOUT_URL, LOGOUT_REDIRECT_URL #LOGOUT_REDIRECT_URL specifies a default logout page that will always be used when #users logout from Shibboleth. target = LOGOUT_REDIRECT_URL or quote(request.build_absolute_uri()) diff --git a/thirdpart/shibboleth/decorators.py b/thirdpart/shibboleth/decorators.py index 1e96b0a7f6..ae16e97241 100755 --- a/thirdpart/shibboleth/decorators.py +++ b/thirdpart/shibboleth/decorators.py @@ -3,7 +3,7 @@ Decorators to use with Shibboleth. """ from django.conf import settings from django.contrib import auth -from middleware import ShibbolethRemoteUserMiddleware +from .middleware import ShibbolethRemoteUserMiddleware def login_optional(func): """ diff --git a/thirdpart/shibboleth/middleware.py b/thirdpart/shibboleth/middleware.py index 109cd102de..63fe398a6a 100755 --- a/thirdpart/shibboleth/middleware.py +++ b/thirdpart/shibboleth/middleware.py @@ -106,7 +106,7 @@ class ShibbolethRemoteUserMiddleware(RemoteUserMiddleware): def process_response(self, request, response): if getattr(request, 'shib_login', False): - print '%s: set shibboleth cookie!' % id(self) + print('%s: set shibboleth cookie!' % id(self)) self._set_auth_cookie(request, response) return response @@ -224,7 +224,7 @@ class ShibbolethRemoteUserMiddleware(RemoteUserMiddleware): shib_attrs = {} error = False meta = request.META - for header, attr in SHIB_ATTRIBUTE_MAP.items(): + for header, attr in list(SHIB_ATTRIBUTE_MAP.items()): required, name = attr value = meta.get(header, None) shib_attrs[name] = value diff --git a/thirdpart/shibboleth/tests/__init__.py b/thirdpart/shibboleth/tests/__init__.py index 416df7ac44..21e45719e2 100755 --- a/thirdpart/shibboleth/tests/__init__.py +++ b/thirdpart/shibboleth/tests/__init__.py @@ -1 +1 @@ -from shib import * \ No newline at end of file +from .shib import * \ No newline at end of file diff --git a/thirdpart/shibboleth/urls.py b/thirdpart/shibboleth/urls.py index 89599560d8..42925df9ca 100755 --- a/thirdpart/shibboleth/urls.py +++ b/thirdpart/shibboleth/urls.py @@ -5,7 +5,7 @@ if StrictVersion(django.get_version()) < StrictVersion('1.4'): else: from django.conf.urls import url -from views import ShibbolethView, ShibbolethLogoutView, ShibbolethLoginView +from .views import ShibbolethView, ShibbolethLogoutView, ShibbolethLoginView urlpatterns = [ url(r'^login/$', ShibbolethLoginView.as_view(), name='login'), diff --git a/thirdpart/shibboleth/views.py b/thirdpart/shibboleth/views.py index 86e17988cd..7f4d2d2a18 100755 --- a/thirdpart/shibboleth/views.py +++ b/thirdpart/shibboleth/views.py @@ -9,7 +9,7 @@ from django.shortcuts import redirect from django.utils.decorators import method_decorator from django.views.generic import TemplateView -from urllib import quote +from urllib.parse import quote #Logout settings. from shibboleth.app_settings import LOGOUT_URL, LOGOUT_REDIRECT_URL, LOGOUT_SESSION_KEY @@ -32,9 +32,9 @@ class ShibbolethView(TemplateView): def get(self, request, **kwargs): """Process the request.""" - next = self.request.GET.get('next', None) - if next is not None: - return redirect(next) + next_page = self.request.GET.get('next', None) + if next_page is not None: + return redirect(next_page) return super(ShibbolethView, self).get(request) def get_context_data(self, **kwargs): diff --git a/thirdpart/social_django/__init__.py b/thirdpart/social_django/__init__.py deleted file mode 100644 index 5041050ce8..0000000000 --- a/thirdpart/social_django/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -__version__ = '2.1.0' - - -from social_core.backends.base import BaseAuth - -# django.contrib.auth.load_backend() will import and instanciate the -# authentication backend ignoring the possibility that it might -# require more arguments. Here we set a monkey patch to -# BaseAuth.__init__ to ignore the mandatory strategy argument and load -# it. - -def baseauth_init_workaround(original_init): - def fake_init(self, strategy=None, *args, **kwargs): - from .utils import load_strategy - original_init(self, strategy or load_strategy(), *args, **kwargs) - return fake_init - - -if not getattr(BaseAuth, '__init_patched', False): - BaseAuth.__init__ = baseauth_init_workaround(BaseAuth.__init__) - BaseAuth.__init_patched = True - -default_app_config = 'social_django.config.PythonSocialAuthConfig' diff --git a/thirdpart/social_django/admin.py b/thirdpart/social_django/admin.py deleted file mode 100644 index 635d3d821b..0000000000 --- a/thirdpart/social_django/admin.py +++ /dev/null @@ -1,62 +0,0 @@ -"""Admin settings""" -from itertools import chain - -from django.conf import settings -from django.contrib import admin - -from social_core.utils import setting_name -from .models import UserSocialAuth, Nonce, Association - - -class UserSocialAuthOption(admin.ModelAdmin): - """Social Auth user options""" - list_display = ('user', 'id', 'provider', 'uid') - list_filter = ('provider',) - raw_id_fields = ('user',) - list_select_related = True - - def get_search_fields(self, request=None): - search_fields = getattr( - settings, setting_name('ADMIN_USER_SEARCH_FIELDS'), None - ) - if search_fields is None: - _User = UserSocialAuth.user_model() - username = getattr(_User, 'USERNAME_FIELD', None) or \ - hasattr(_User, 'username') and 'username' or \ - None - fieldnames = ('first_name', 'last_name', 'email', username) - all_names = self._get_all_field_names(_User._meta) - search_fields = [name for name in fieldnames - if name and name in all_names] - return ['user__' + name for name in search_fields] + \ - getattr(settings, setting_name('ADMIN_SEARCH_FIELDS'), []) - - @staticmethod - def _get_all_field_names(model): - names = chain.from_iterable( - (field.name, field.attname) - if hasattr(field, 'attname') else (field.name,) - for field in model.get_fields() - # For complete backwards compatibility, you may want to exclude - # GenericForeignKey from the results. - if not (field.many_to_one and field.related_model is None) - ) - return list(set(names)) - - -class NonceOption(admin.ModelAdmin): - """Nonce options""" - list_display = ('id', 'server_url', 'timestamp', 'salt') - search_fields = ('server_url',) - - -class AssociationOption(admin.ModelAdmin): - """Association options""" - list_display = ('id', 'server_url', 'assoc_type') - list_filter = ('assoc_type',) - search_fields = ('server_url',) - - -admin.site.register(UserSocialAuth, UserSocialAuthOption) -admin.site.register(Nonce, NonceOption) -admin.site.register(Association, AssociationOption) diff --git a/thirdpart/social_django/compat.py b/thirdpart/social_django/compat.py deleted file mode 100644 index 4789849cac..0000000000 --- a/thirdpart/social_django/compat.py +++ /dev/null @@ -1,34 +0,0 @@ -# coding=utf-8 -import six -import django -from django.db import models - - -try: - from django.urls import reverse -except ImportError: - from django.core.urlresolvers import reverse - -try: - from django.utils.deprecation import MiddlewareMixin -except ImportError: - MiddlewareMixin = object - - -def get_rel_model(field): - if django.VERSION >= (2, 0): - return field.remote_field.model - - user_model = field.rel.to - if isinstance(user_model, six.string_types): - app_label, model_name = user_model.split('.') - user_model = models.get_model(app_label, model_name) - return user_model - - -def get_request_port(request): - if django.VERSION >= (1, 9): - return request.get_port() - - host_parts = request.get_host().partition(':') - return host_parts[2] or request.META['SERVER_PORT'] diff --git a/thirdpart/social_django/config.py b/thirdpart/social_django/config.py deleted file mode 100644 index c1491bb184..0000000000 --- a/thirdpart/social_django/config.py +++ /dev/null @@ -1,10 +0,0 @@ -from django.apps import AppConfig - - -class PythonSocialAuthConfig(AppConfig): - # Full Python path to the application eg. 'django.contrib.admin'. - name = 'social_django' - # Last component of the Python path to the application eg. 'admin'. - label = 'social_django' - # Human-readable name for the application eg. "Admin". - verbose_name = 'Python Social Auth' diff --git a/thirdpart/social_django/context_processors.py b/thirdpart/social_django/context_processors.py deleted file mode 100644 index 07e875c521..0000000000 --- a/thirdpart/social_django/context_processors.py +++ /dev/null @@ -1,52 +0,0 @@ -from django.contrib.auth import REDIRECT_FIELD_NAME -from django.utils.functional import SimpleLazyObject -from django.utils.http import urlquote - -try: - from django.utils.functional import empty as _empty - empty = _empty -except ImportError: # django < 1.4 - empty = None - - -from social_core.backends.utils import user_backends_data -from .utils import Storage, BACKENDS - - -class LazyDict(SimpleLazyObject): - """Lazy dict initialization.""" - def __getitem__(self, name): - if self._wrapped is empty: - self._setup() - return self._wrapped[name] - - def __setitem__(self, name, value): - if self._wrapped is empty: - self._setup() - self._wrapped[name] = value - - -def backends(request): - """Load Social Auth current user data to context under the key 'backends'. - Will return the output of social_core.backends.utils.user_backends_data.""" - return {'backends': LazyDict(lambda: user_backends_data(request.user, - BACKENDS, - Storage))} - - -def login_redirect(request): - """Load current redirect to context.""" - value = request.method == 'POST' and \ - request.POST.get(REDIRECT_FIELD_NAME) or \ - request.GET.get(REDIRECT_FIELD_NAME) - if value: - value = urlquote(value) - querystring = REDIRECT_FIELD_NAME + '=' + value - else: - querystring = '' - - return { - 'REDIRECT_FIELD_NAME': REDIRECT_FIELD_NAME, - 'REDIRECT_FIELD_VALUE': value, - 'REDIRECT_QUERYSTRING': querystring - } diff --git a/thirdpart/social_django/fields.py b/thirdpart/social_django/fields.py deleted file mode 100644 index d547ce8e9f..0000000000 --- a/thirdpart/social_django/fields.py +++ /dev/null @@ -1,94 +0,0 @@ -import json -import six -import functools - -import django - -from django.core.exceptions import ValidationError -from django.conf import settings -from django.db import models - -from social_core.utils import setting_name - -try: - from django.utils.encoding import smart_unicode as smart_text - smart_text # placate pyflakes -except ImportError: - from django.utils.encoding import smart_text - -# SubfieldBase causes RemovedInDjango110Warning in 1.8 and 1.9, and -# will not work in 1.10 or later -if django.VERSION[:2] >= (1, 8): - field_metaclass = type -else: - from django.db.models import SubfieldBase - field_metaclass = SubfieldBase - -field_class = functools.partial(six.with_metaclass, field_metaclass) - -if getattr(settings, setting_name('POSTGRES_JSONFIELD'), False): - from django.contrib.postgres.fields import JSONField as JSONFieldBase -else: - JSONFieldBase = field_class(models.TextField) - - -class JSONField(JSONFieldBase): - """Simple JSON field that stores python structures as JSON strings - on database. - """ - - def __init__(self, *args, **kwargs): - kwargs.setdefault('default', dict) - super(JSONField, self).__init__(*args, **kwargs) - - def from_db_value(self, value, expression, connection, context): - return self.to_python(value) - - def to_python(self, value): - """ - Convert the input JSON value into python structures, raises - django.core.exceptions.ValidationError if the data can't be converted. - """ - if self.blank and not value: - return {} - value = value or '{}' - if isinstance(value, six.binary_type): - value = six.text_type(value, 'utf-8') - if isinstance(value, six.string_types): - try: - # with django 1.6 i have '"{}"' as default value here - if value[0] == value[-1] == '"': - value = value[1:-1] - - return json.loads(value) - except Exception as err: - raise ValidationError(str(err)) - else: - return value - - def validate(self, value, model_instance): - """Check value is a valid JSON string, raise ValidationError on - error.""" - if isinstance(value, six.string_types): - super(JSONField, self).validate(value, model_instance) - try: - json.loads(value) - except Exception as err: - raise ValidationError(str(err)) - - def get_prep_value(self, value): - """Convert value to JSON string before save""" - try: - return json.dumps(value) - except Exception as err: - raise ValidationError(str(err)) - - def value_to_string(self, obj): - """Return value from object converted to string properly""" - return smart_text(self.value_from_object(obj)) - - def value_from_object(self, obj): - """Return value dumped to string.""" - orig_val = super(JSONField, self).value_from_object(obj) - return self.get_prep_value(orig_val) - diff --git a/thirdpart/social_django/management/__init__.py b/thirdpart/social_django/management/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/thirdpart/social_django/management/commands/__init__.py b/thirdpart/social_django/management/commands/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/thirdpart/social_django/management/commands/clearsocial.py b/thirdpart/social_django/management/commands/clearsocial.py deleted file mode 100644 index fa1533334d..0000000000 --- a/thirdpart/social_django/management/commands/clearsocial.py +++ /dev/null @@ -1,35 +0,0 @@ -from datetime import timedelta - -from django.core.management.base import BaseCommand -from django.utils import timezone - -from social_django.models import Code, Partial - - -class Command(BaseCommand): - help = 'removes old not used verification codes and partials' - - def add_arguments(self, parser): - super(Command, self).add_arguments(parser) - parser.add_argument( - '--age', - action='store', - type=int, - dest='age', - default=14, - help='how long to keep unused data (in days, defaults to 14)' - ) - - def handle(self, *args, **options): - age = timezone.now() - timedelta(days=options['age']) - - # Delete old not verified codes - Code.objects.filter( - verified=False, - timestamp__lt=age - ).delete() - - # Delete old partial data - Partial.objects.filter( - timestamp__lt=age - ).delete() diff --git a/thirdpart/social_django/managers.py b/thirdpart/social_django/managers.py deleted file mode 100644 index 1fa91b68f7..0000000000 --- a/thirdpart/social_django/managers.py +++ /dev/null @@ -1,15 +0,0 @@ -from django.db import models - - -class UserSocialAuthManager(models.Manager): - """Manager for the UserSocialAuth django model.""" - - class Meta: - app_label = "social_django" - - def get_social_auth(self, provider, uid): - try: - return self.select_related('user').get(provider=provider, - uid=uid) - except self.model.DoesNotExist: - return None diff --git a/thirdpart/social_django/middleware.py b/thirdpart/social_django/middleware.py deleted file mode 100644 index 6d5d7f572d..0000000000 --- a/thirdpart/social_django/middleware.py +++ /dev/null @@ -1,65 +0,0 @@ -# -*- coding: utf-8 -*- -import six - -from django.apps import apps -from django.conf import settings -from django.contrib import messages -from django.contrib.messages.api import MessageFailure -from django.shortcuts import redirect -from django.utils.http import urlquote - -from social_core.exceptions import SocialAuthBaseException -from social_core.utils import social_logger -from .compat import MiddlewareMixin - - -class SocialAuthExceptionMiddleware(MiddlewareMixin): - """Middleware that handles Social Auth AuthExceptions by providing the user - with a message, logging an error, and redirecting to some next location. - - By default, the exception message itself is sent to the user and they are - redirected to the location specified in the SOCIAL_AUTH_LOGIN_ERROR_URL - setting. - - This middleware can be extended by overriding the get_message or - get_redirect_uri methods, which each accept request and exception. - """ - def process_exception(self, request, exception): - strategy = getattr(request, 'social_strategy', None) - if strategy is None or self.raise_exception(request, exception): - return - - if isinstance(exception, SocialAuthBaseException): - backend = getattr(request, 'backend', None) - backend_name = getattr(backend, 'name', 'unknown-backend') - - message = self.get_message(request, exception) - url = self.get_redirect_uri(request, exception) - - if apps.is_installed('django.contrib.messages'): - social_logger.info(message) - try: - messages.error(request, message, - extra_tags='social-auth ' + backend_name) - except MessageFailure: - if url: - url += ('?' in url and '&' or '?') + \ - 'message={0}&backend={1}'.format(urlquote(message), - backend_name) - else: - social_logger.error(message) - - if url: - return redirect(url) - - def raise_exception(self, request, exception): - strategy = getattr(request, 'social_strategy', None) - if strategy is not None: - return strategy.setting('RAISE_EXCEPTIONS') or settings.DEBUG - - def get_message(self, request, exception): - return six.text_type(exception) - - def get_redirect_uri(self, request, exception): - strategy = getattr(request, 'social_strategy', None) - return strategy.setting('LOGIN_ERROR_URL') diff --git a/thirdpart/social_django/migrations/0001_initial.py b/thirdpart/social_django/migrations/0001_initial.py deleted file mode 100644 index 61315ec33d..0000000000 --- a/thirdpart/social_django/migrations/0001_initial.py +++ /dev/null @@ -1,107 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.11 on 2018-05-25 03:27 -from __future__ import unicode_literals - -from django.db import migrations, models -import seahub.base.fields -import social_django.fields -import social_django.storage - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Association', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('server_url', models.CharField(max_length=255)), - ('handle', models.CharField(max_length=255)), - ('secret', models.CharField(max_length=255)), - ('issued', models.IntegerField()), - ('lifetime', models.IntegerField()), - ('assoc_type', models.CharField(max_length=64)), - ], - options={ - 'db_table': 'social_auth_association', - }, - bases=(models.Model, social_django.storage.DjangoAssociationMixin), - ), - migrations.CreateModel( - name='Code', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('email', models.EmailField(max_length=254)), - ('code', models.CharField(db_index=True, max_length=32)), - ('verified', models.BooleanField(default=False)), - ('timestamp', models.DateTimeField(auto_now_add=True, db_index=True)), - ], - options={ - 'db_table': 'social_auth_code', - }, - bases=(models.Model, social_django.storage.DjangoCodeMixin), - ), - migrations.CreateModel( - name='Nonce', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('server_url', models.CharField(max_length=255)), - ('timestamp', models.IntegerField()), - ('salt', models.CharField(max_length=65)), - ], - options={ - 'db_table': 'social_auth_nonce', - }, - bases=(models.Model, social_django.storage.DjangoNonceMixin), - ), - migrations.CreateModel( - name='Partial', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('token', models.CharField(db_index=True, max_length=32)), - ('next_step', models.PositiveSmallIntegerField(default=0)), - ('backend', models.CharField(max_length=32)), - ('data', social_django.fields.JSONField(default=dict)), - ('timestamp', models.DateTimeField(auto_now_add=True, db_index=True)), - ], - options={ - 'db_table': 'social_auth_partial', - }, - bases=(models.Model, social_django.storage.DjangoPartialMixin), - ), - migrations.CreateModel( - name='UserSocialAuth', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('username', seahub.base.fields.LowerCaseCharField(db_index=True, max_length=255)), - ('provider', models.CharField(max_length=32)), - ('uid', models.CharField(max_length=255)), - ('extra_data', social_django.fields.JSONField(default=dict)), - ], - options={ - 'db_table': 'social_auth_usersocialauth', - }, - bases=(models.Model, social_django.storage.DjangoUserMixin), - ), - migrations.AlterUniqueTogether( - name='usersocialauth', - unique_together=set([('provider', 'uid')]), - ), - migrations.AlterUniqueTogether( - name='nonce', - unique_together=set([('server_url', 'timestamp', 'salt')]), - ), - migrations.AlterUniqueTogether( - name='code', - unique_together=set([('email', 'code')]), - ), - migrations.AlterUniqueTogether( - name='association', - unique_together=set([('server_url', 'handle')]), - ), - ] diff --git a/thirdpart/social_django/migrations/__init__.py b/thirdpart/social_django/migrations/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/thirdpart/social_django/models.py b/thirdpart/social_django/models.py deleted file mode 100644 index 1b420d3362..0000000000 --- a/thirdpart/social_django/models.py +++ /dev/null @@ -1,159 +0,0 @@ -"""Django ORM models for Social Auth""" -import six - -from django.db import models -from django.conf import settings -from django.db.utils import IntegrityError - -from social_core.utils import setting_name -from seahub.base.accounts import User -from seahub.base.fields import LowerCaseCharField - -from .compat import get_rel_model -from .storage import DjangoUserMixin, DjangoAssociationMixin, \ - DjangoNonceMixin, DjangoCodeMixin, \ - DjangoPartialMixin, BaseDjangoStorage -from .fields import JSONField -from .managers import UserSocialAuthManager - -USER_MODEL = getattr(settings, setting_name('USER_MODEL'), None) or \ - getattr(settings, 'AUTH_USER_MODEL', None) or \ - 'auth.User' -UID_LENGTH = getattr(settings, setting_name('UID_LENGTH'), 255) -EMAIL_LENGTH = getattr(settings, setting_name('EMAIL_LENGTH'), 254) -NONCE_SERVER_URL_LENGTH = getattr( - settings, setting_name('NONCE_SERVER_URL_LENGTH'), 255) -ASSOCIATION_SERVER_URL_LENGTH = getattr( - settings, setting_name('ASSOCIATION_SERVER_URL_LENGTH'), 255) -ASSOCIATION_HANDLE_LENGTH = getattr( - settings, setting_name('ASSOCIATION_HANDLE_LENGTH'), 255) - - -class AbstractUserSocialAuth(models.Model, DjangoUserMixin): - """Abstract Social Auth association model""" - # user = models.ForeignKey(USER_MODEL, related_name='social_auth', - # on_delete=models.CASCADE) - username = LowerCaseCharField(max_length=255, db_index=True) - provider = models.CharField(max_length=32) - uid = models.CharField(max_length=UID_LENGTH) - extra_data = JSONField() - objects = UserSocialAuthManager() - - def __str__(self): - return str(self.username) - - class Meta: - app_label = "social_django" - abstract = True - - @classmethod - def get_social_auth(cls, provider, uid): - try: - social_auth = cls.objects.get(provider=provider, uid=uid) - except cls.DoesNotExist: - return None - - try: - u = User.objects.get(email=social_auth.username) - social_auth.user = u - except User.DoesNotExist: - social_auth.user = None - - return social_auth - - @classmethod - def username_max_length(cls): - return 255 - # username_field = cls.username_field() - # field = cls.user_model()._meta.get_field(username_field) - # return field.max_length - - @classmethod - def user_model(cls): - return User - # user_model = get_rel_model(field=cls._meta.get_field('user')) - # return user_model - - -class UserSocialAuth(AbstractUserSocialAuth): - """Social Auth association model""" - - class Meta: - """Meta data""" - app_label = "social_django" - unique_together = ('provider', 'uid') - db_table = 'social_auth_usersocialauth' - - -class Nonce(models.Model, DjangoNonceMixin): - """One use numbers""" - server_url = models.CharField(max_length=NONCE_SERVER_URL_LENGTH) - timestamp = models.IntegerField() - salt = models.CharField(max_length=65) - - class Meta: - app_label = "social_django" - unique_together = ('server_url', 'timestamp', 'salt') - db_table = 'social_auth_nonce' - - -class Association(models.Model, DjangoAssociationMixin): - """OpenId account association""" - server_url = models.CharField(max_length=ASSOCIATION_SERVER_URL_LENGTH) - handle = models.CharField(max_length=ASSOCIATION_HANDLE_LENGTH) - secret = models.CharField(max_length=255) # Stored base64 encoded - issued = models.IntegerField() - lifetime = models.IntegerField() - assoc_type = models.CharField(max_length=64) - - class Meta: - app_label = "social_django" - db_table = 'social_auth_association' - unique_together = ( - ('server_url', 'handle',) - ) - - -class Code(models.Model, DjangoCodeMixin): - email = models.EmailField(max_length=EMAIL_LENGTH) - code = models.CharField(max_length=32, db_index=True) - verified = models.BooleanField(default=False) - timestamp = models.DateTimeField(auto_now_add=True, db_index=True) - - class Meta: - app_label = "social_django" - db_table = 'social_auth_code' - unique_together = ('email', 'code') - - -class Partial(models.Model, DjangoPartialMixin): - token = models.CharField(max_length=32, db_index=True) - next_step = models.PositiveSmallIntegerField(default=0) - backend = models.CharField(max_length=32) - data = JSONField() - timestamp = models.DateTimeField(auto_now_add=True, db_index=True) - - class Meta: - app_label = "social_django" - db_table = 'social_auth_partial' - - -class DjangoStorage(BaseDjangoStorage): - user = UserSocialAuth - nonce = Nonce - association = Association - code = Code - partial = Partial - - @classmethod - def is_integrity_error(cls, exception): - return exception.__class__ is IntegrityError - -########## handle signals -from django.dispatch import receiver -from registration.signals import user_deleted - -@receiver(user_deleted) -def user_deleted_cb(sender, **kwargs): - username = kwargs['username'] - UserSocialAuth.objects.filter(username=username).delete() diff --git a/thirdpart/social_django/storage.py b/thirdpart/social_django/storage.py deleted file mode 100644 index 139c6f8243..0000000000 --- a/thirdpart/social_django/storage.py +++ /dev/null @@ -1,219 +0,0 @@ -"""Django ORM models for Social Auth""" -import base64 -import six -import sys -from django.db import transaction -from django.db.utils import IntegrityError - -from social_core.storage import UserMixin, AssociationMixin, NonceMixin, \ - CodeMixin, PartialMixin, BaseStorage -from seahub.base.accounts import User - - -class DjangoUserMixin(UserMixin): - """Social Auth association model""" - @classmethod - def changed(cls, user): - user.save() - - def set_extra_data(self, extra_data=None): - if super(DjangoUserMixin, self).set_extra_data(extra_data): - self.save() - - @classmethod - def allowed_to_disconnect(cls, user, backend_name, association_id=None): - if association_id is not None: - qs = cls.objects.exclude(id=association_id) - else: - qs = cls.objects.exclude(provider=backend_name) - qs = qs.filter(username=user.username) - - if hasattr(user, 'has_usable_password'): - valid_password = user.has_usable_password() - else: - valid_password = True - return valid_password or qs.count() > 0 - - @classmethod - def disconnect(cls, entry): - entry.delete() - - @classmethod - def username_field(cls): - return 'username' - # return getattr(cls.user_model(), 'USERNAME_FIELD', 'username') - - @classmethod - def user_exists(cls, *args, **kwargs): - """ - Return True/False if a User instance exists with the given arguments. - Arguments are directly passed to filter() manager method. - """ - if 'username' in kwargs: - kwargs[cls.username_field()] = kwargs.pop('username') - - assert 'username' in kwargs - - try: - User.objects.get(email=kwargs['username']) - return True - except User.DoesNotExist: - return False - # return cls.user_model().objects.filter(*args, **kwargs).count() > 0 - - @classmethod - def get_username(cls, user): - return getattr(user, cls.username_field(), None) - - @classmethod - def create_user(cls, *args, **kwargs): - username_field = cls.username_field() - if 'username' in kwargs and username_field not in kwargs: - kwargs[username_field] = kwargs.pop('username') - - assert 'username' in kwargs - - user = User.objects.create_user(email=kwargs['username'], - is_active=True) - - # try: - # if hasattr(transaction, 'atomic'): - # # In Django versions that have an "atomic" transaction decorator / context - # # manager, there's a transaction wrapped around this call. - # # If the create fails below due to an IntegrityError, ensure that the transaction - # # stays undamaged by wrapping the create in an atomic. - # with transaction.atomic(): - # user = cls.user_model().objects.create_user(*args, **kwargs) - # else: - # user = cls.user_model().objects.create_user(*args, **kwargs) - # except IntegrityError: - # # User might have been created on a different thread, try and find them. - # # If we don't, re-raise the IntegrityError. - # exc_info = sys.exc_info() - # # If email comes in as None it won't get found in the get - # if kwargs.get('email', True) is None: - # kwargs['email'] = '' - # try: - # user = cls.user_model().objects.get(*args, **kwargs) - # except cls.user_model().DoesNotExist: - # six.reraise(*exc_info) - return user - - @classmethod - def get_user(cls, pk=None, **kwargs): - if pk: - kwargs = {'pk': pk} - - try: - return User.objects.get(email=pk) - except User.DoesNotExist: - return None - # try: - # return cls.user_model().objects.get(**kwargs) - # except cls.user_model().DoesNotExist: - # return None - - @classmethod - def get_users_by_email(cls, email): - user_model = cls.user_model() - email_field = getattr(user_model, 'EMAIL_FIELD', 'email') - return user_model.objects.filter(**{email_field + '__iexact': email}) - - @classmethod - def get_social_auth(cls, provider, uid): - if not isinstance(uid, six.string_types): - uid = str(uid) - try: - return cls.objects.get(provider=provider, uid=uid) - except cls.DoesNotExist: - return None - - @classmethod - def get_social_auth_for_user(cls, user, provider=None, id=None): - qs = cls.objects.filter(username=user.username) - - if provider: - qs = qs.filter(provider=provider) - - if id: - qs = qs.filter(id=id) - return qs - - @classmethod - def create_social_auth(cls, user, uid, provider): - if not isinstance(uid, six.string_types): - uid = str(uid) - if hasattr(transaction, 'atomic'): - # In Django versions that have an "atomic" transaction decorator / context - # manager, there's a transaction wrapped around this call. - # If the create fails below due to an IntegrityError, ensure that the transaction - # stays undamaged by wrapping the create in an atomic. - with transaction.atomic(): - social_auth = cls.objects.create(username=user.username, uid=uid, provider=provider) - else: - social_auth = cls.objects.create(username=user.username, uid=uid, provider=provider) - return social_auth - - -class DjangoNonceMixin(NonceMixin): - @classmethod - def use(cls, server_url, timestamp, salt): - return cls.objects.get_or_create(server_url=server_url, - timestamp=timestamp, - salt=salt)[1] - - -class DjangoAssociationMixin(AssociationMixin): - @classmethod - def store(cls, server_url, association): - # Don't use get_or_create because issued cannot be null - try: - assoc = cls.objects.get(server_url=server_url, - handle=association.handle) - except cls.DoesNotExist: - assoc = cls(server_url=server_url, - handle=association.handle) - assoc.secret = base64.encodestring(association.secret) - assoc.issued = association.issued - assoc.lifetime = association.lifetime - assoc.assoc_type = association.assoc_type - assoc.save() - - @classmethod - def get(cls, *args, **kwargs): - return cls.objects.filter(*args, **kwargs) - - @classmethod - def remove(cls, ids_to_delete): - cls.objects.filter(pk__in=ids_to_delete).delete() - - -class DjangoCodeMixin(CodeMixin): - @classmethod - def get_code(cls, code): - try: - return cls.objects.get(code=code) - except cls.DoesNotExist: - return None - - -class DjangoPartialMixin(PartialMixin): - @classmethod - def load(cls, token): - try: - return cls.objects.get(token=token) - except cls.DoesNotExist: - return None - - @classmethod - def destroy(cls, token): - partial = cls.load(token) - if partial: - partial.delete() - - -class BaseDjangoStorage(BaseStorage): - user = DjangoUserMixin - nonce = DjangoNonceMixin - association = DjangoAssociationMixin - code = DjangoCodeMixin diff --git a/thirdpart/social_django/strategy.py b/thirdpart/social_django/strategy.py deleted file mode 100644 index 1a3a820afa..0000000000 --- a/thirdpart/social_django/strategy.py +++ /dev/null @@ -1,159 +0,0 @@ -# coding=utf-8 -from django.conf import settings -from django.http import HttpResponse, HttpRequest -from django.db.models import Model -from django.contrib.contenttypes.models import ContentType -from django.contrib.auth import authenticate -from django.shortcuts import redirect, resolve_url -from django.template import TemplateDoesNotExist, loader, engines -from django.utils.crypto import get_random_string -from django.utils.encoding import force_text -from django.utils.functional import Promise -from django.utils.translation import get_language - -from social_core.strategy import BaseStrategy, BaseTemplateStrategy -from .compat import get_request_port - - -def render_template_string(request, html, context=None): - """Take a template in the form of a string and render it for the - given context""" - template = engines['django'].from_string(html) - return template.render(context=context, request=request) - - -class DjangoTemplateStrategy(BaseTemplateStrategy): - def render_template(self, tpl, context): - template = loader.get_template(tpl) - return template.render(context=context, request=self.strategy.request) - - def render_string(self, html, context): - return render_template_string(self.strategy.request, html, context) - - -class DjangoStrategy(BaseStrategy): - DEFAULT_TEMPLATE_STRATEGY = DjangoTemplateStrategy - - def __init__(self, storage, request=None, tpl=None): - self.request = request - self.session = request.session if request else {} - super(DjangoStrategy, self).__init__(storage, tpl) - - def get_setting(self, name): - value = getattr(settings, name) - # Force text on URL named settings that are instance of Promise - if name.endswith('_URL'): - if isinstance(value, Promise): - value = force_text(value) - value = resolve_url(value) - return value - - def request_data(self, merge=True): - if not self.request: - return {} - if merge: - data = self.request.GET.copy() - data.update(self.request.POST) - elif self.request.method == 'POST': - data = self.request.POST - else: - data = self.request.GET - return data - - def request_host(self): - if self.request: - return self.request.get_host() - - def request_is_secure(self): - """Is the request using HTTPS?""" - return self.request.is_secure() - - def request_path(self): - """path of the current request""" - return self.request.path - - def request_port(self): - """Port in use for this request""" - return get_request_port(request=self.request) - - def request_get(self): - """Request GET data""" - return self.request.GET.copy() - - def request_post(self): - """Request POST data""" - return self.request.POST.copy() - - def redirect(self, url): - return redirect(url) - - def html(self, content): - return HttpResponse(content, content_type='text/html;charset=UTF-8') - - def render_html(self, tpl=None, html=None, context=None): - if not tpl and not html: - raise ValueError('Missing template or html parameters') - context = context or {} - try: - template = loader.get_template(tpl) - return template.render(context=context, request=self.request) - except TemplateDoesNotExist: - return render_template_string(self.request, html, context) - - def authenticate(self, backend, *args, **kwargs): - kwargs['strategy'] = self - kwargs['storage'] = self.storage - kwargs['backend'] = backend - return authenticate(*args, **kwargs) - - def clean_authenticate_args(self, *args, **kwargs): - """Cleanup request argument if present, which is passed to - authenticate as for Django 1.11""" - if len(args) > 0 and isinstance(args[0], HttpRequest): - kwargs['request'], args = args[0], args[1:] - return args, kwargs - - def session_get(self, name, default=None): - return self.session.get(name, default) - - def session_set(self, name, value): - self.session[name] = value - if hasattr(self.session, 'modified'): - self.session.modified = True - - def session_pop(self, name): - return self.session.pop(name, None) - - def session_setdefault(self, name, value): - return self.session.setdefault(name, value) - - def build_absolute_uri(self, path=None): - if self.request: - return self.request.build_absolute_uri(path) - else: - return path - - def random_string(self, length=12, chars=BaseStrategy.ALLOWED_CHARS): - return get_random_string(length, chars) - - def to_session_value(self, val): - """Converts values that are instance of Model to a dictionary - with enough information to retrieve the instance back later.""" - if isinstance(val, Model): - val = { - 'pk': val.pk, - 'ctype': ContentType.objects.get_for_model(val).pk - } - return val - - def from_session_value(self, val): - """Converts back the instance saved by self._ctype function.""" - if isinstance(val, dict) and 'pk' in val and 'ctype' in val: - ctype = ContentType.objects.get_for_id(val['ctype']) - ModelClass = ctype.model_class() - val = ModelClass.objects.get(pk=val['pk']) - return val - - def get_language(self): - """Return current language""" - return get_language() diff --git a/thirdpart/social_django/urls.py b/thirdpart/social_django/urls.py deleted file mode 100644 index 68a07c7273..0000000000 --- a/thirdpart/social_django/urls.py +++ /dev/null @@ -1,24 +0,0 @@ -"""URLs module""" -from django.conf import settings -from django.conf.urls import url - -from social_core.utils import setting_name -from . import views - - -extra = getattr(settings, setting_name('TRAILING_SLASH'), True) and '/' or '' - -app_name = 'social' - -urlpatterns = [ - # authentication / association - url(r'^login/(?P[^/]+){0}$'.format(extra), views.auth, - name='begin'), - url(r'^complete/(?P[^/]+){0}$'.format(extra), views.complete, - name='complete'), - # disconnection - url(r'^disconnect/(?P[^/]+){0}$'.format(extra), views.disconnect, - name='disconnect'), - url(r'^disconnect/(?P[^/]+)/(?P\d+){0}$' - .format(extra), views.disconnect, name='disconnect_individual'), -] diff --git a/thirdpart/social_django/utils.py b/thirdpart/social_django/utils.py deleted file mode 100644 index 281bdd49f6..0000000000 --- a/thirdpart/social_django/utils.py +++ /dev/null @@ -1,51 +0,0 @@ -# coding=utf-8 -from functools import wraps - -from django.conf import settings -from django.http import Http404 - -from social_core.utils import setting_name, module_member, get_strategy -from social_core.exceptions import MissingBackend -from social_core.backends.utils import get_backend -from .compat import reverse - - -BACKENDS = settings.AUTHENTICATION_BACKENDS -STRATEGY = getattr(settings, setting_name('STRATEGY'), - 'social_django.strategy.DjangoStrategy') -STORAGE = getattr(settings, setting_name('STORAGE'), - 'social_django.models.DjangoStorage') -Strategy = module_member(STRATEGY) -Storage = module_member(STORAGE) - - -def load_strategy(request=None): - return get_strategy(STRATEGY, STORAGE, request) - - -def load_backend(strategy, name, redirect_uri): - Backend = get_backend(BACKENDS, name) - return Backend(strategy, redirect_uri) - - -def psa(redirect_uri=None, load_strategy=load_strategy): - def decorator(func): - @wraps(func) - def wrapper(request, backend, *args, **kwargs): - uri = redirect_uri - if uri and not uri.startswith('/'): - uri = reverse(redirect_uri, args=(backend,)) - request.social_strategy = load_strategy(request) - # backward compatibility in attribute name, only if not already - # defined - if not hasattr(request, 'strategy'): - request.strategy = request.social_strategy - - try: - request.backend = load_backend(request.social_strategy, - backend, uri) - except MissingBackend: - raise Http404('Backend not found') - return func(request, backend, *args, **kwargs) - return wrapper - return decorator diff --git a/thirdpart/social_django/views.py b/thirdpart/social_django/views.py deleted file mode 100644 index a43008ef53..0000000000 --- a/thirdpart/social_django/views.py +++ /dev/null @@ -1,131 +0,0 @@ -from django.conf import settings -from django.contrib.auth import REDIRECT_FIELD_NAME -from django.contrib.auth.decorators import login_required -from django.views.decorators.csrf import csrf_exempt, csrf_protect -from django.views.decorators.http import require_POST -from django.views.decorators.cache import never_cache - -from seahub.auth import login - -from social_core.utils import setting_name -from social_core.actions import do_auth, do_complete, do_disconnect -from .utils import psa - - -NAMESPACE = getattr(settings, setting_name('URL_NAMESPACE'), None) or 'social' - -# Calling `session.set_expiry(None)` results in a session lifetime equal to -# platform default session lifetime. -DEFAULT_SESSION_TIMEOUT = None - - -@never_cache -@psa('{0}:complete'.format(NAMESPACE)) -def auth(request, backend): - return do_auth(request.backend, redirect_name=REDIRECT_FIELD_NAME) - - -@never_cache -@csrf_exempt -@psa('{0}:complete'.format(NAMESPACE)) -def complete(request, backend, *args, **kwargs): - """Authentication complete view""" - return do_complete(request.backend, _do_login, request.user, - redirect_name=REDIRECT_FIELD_NAME, request=request, - *args, **kwargs) - - -@never_cache -@login_required -@psa() -@require_POST -@csrf_protect -def disconnect(request, backend, association_id=None): - """Disconnects given backend from current logged in user.""" - return do_disconnect(request.backend, request.user, association_id, - redirect_name=REDIRECT_FIELD_NAME) - - -def get_session_timeout(social_user, enable_session_expiration=False, - max_session_length=None): - if enable_session_expiration: - # Retrieve an expiration date from the social user who just finished - # logging in; this value was set by the social auth backend, and was - # typically received from the server. - expiration = social_user.expiration_datetime() - - # We've enabled session expiration. Check to see if we got - # a specific expiration time from the provider for this user; - # if not, use the platform default expiration. - if expiration: - received_expiration_time = expiration.total_seconds() - else: - received_expiration_time = DEFAULT_SESSION_TIMEOUT - - # Check to see if the backend set a value as a maximum length - # that a session may be; if they did, then we should use the minimum - # of that and the received session expiration time, if any, to - # set the session length. - if received_expiration_time is None and max_session_length is None: - # We neither received an expiration length, nor have a maximum - # session length. Use the platform default. - session_expiry = DEFAULT_SESSION_TIMEOUT - elif received_expiration_time is None and max_session_length is not None: - # We only have a maximum session length; use that. - session_expiry = max_session_length - elif received_expiration_time is not None and max_session_length is None: - # We only have an expiration time received by the backend - # from the provider, with no set maximum. Use that. - session_expiry = received_expiration_time - else: - # We received an expiration time from the backend, and we also - # have a set maximum session length. Use the smaller of the two. - session_expiry = min(received_expiration_time, max_session_length) - else: - # If there's an explicitly-set maximum session length, use that - # even if we don't want to retrieve session expiry times from - # the backend. If there isn't, then use the platform default. - if max_session_length is None: - session_expiry = DEFAULT_SESSION_TIMEOUT - else: - session_expiry = max_session_length - - return session_expiry - - -def _do_login(backend, user, social_user): - user.backend = '{0}.{1}'.format(backend.__module__, - backend.__class__.__name__) - # Get these details early to avoid any issues involved in the - # session switch that happens when we call login(). - enable_session_expiration = backend.setting('SESSION_EXPIRATION', False) - max_session_length_setting = backend.setting('MAX_SESSION_LENGTH', None) - - # Log the user in, creating a new session. - login(backend.strategy.request, user) - - # Make sure that the max_session_length value is either an integer or - # None. Because we get this as a setting from the backend, it can be set - # to whatever the backend creator wants; we want to be resilient against - # unexpected types being presented to us. - try: - max_session_length = int(max_session_length_setting) - except (TypeError, ValueError): - # We got a response that doesn't look like a number; use the default. - max_session_length = None - - # Get the session expiration length based on the maximum session length - # setting, combined with any session length received from the backend. - session_expiry = get_session_timeout( - social_user, - enable_session_expiration=enable_session_expiration, - max_session_length=max_session_length, - ) - - try: - # Set the session length to our previously determined expiry length. - backend.strategy.request.session.set_expiry(session_expiry) - except OverflowError: - # The timestamp we used wasn't in the range of values supported by - # Django for session length; use the platform default. We tried. - backend.strategy.request.session.set_expiry(DEFAULT_SESSION_TIMEOUT) diff --git a/thirdpart/termsandconditions/__init__.py b/thirdpart/termsandconditions/__init__.py index d84400e5be..4330224096 100644 --- a/thirdpart/termsandconditions/__init__.py +++ b/thirdpart/termsandconditions/__init__.py @@ -1,2 +1,2 @@ """Django Terms and Conditions Module""" -from __future__ import unicode_literals + diff --git a/thirdpart/termsandconditions/decorators.py b/thirdpart/termsandconditions/decorators.py index 569c4d0ed7..fb559864bd 100644 --- a/thirdpart/termsandconditions/decorators.py +++ b/thirdpart/termsandconditions/decorators.py @@ -2,7 +2,7 @@ try: from urllib.parse import urlparse, urlunparse except ImportError: - from urlparse import urlparse, urlunparse + from urllib.parse import urlparse, urlunparse from functools import wraps from django.http import HttpResponseRedirect, QueryDict from django.utils.decorators import available_attrs diff --git a/thirdpart/termsandconditions/migrations/0001_initial.py b/thirdpart/termsandconditions/migrations/0001_initial.py index 95a5eac819..da28a596f9 100644 --- a/thirdpart/termsandconditions/migrations/0001_initial.py +++ b/thirdpart/termsandconditions/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models import seahub.base.fields @@ -47,6 +47,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='usertermsandconditions', - unique_together=set([('username', 'terms')]), + unique_together={('username', 'terms')}, ), ] diff --git a/thirdpart/termsandconditions/models.py b/thirdpart/termsandconditions/models.py index e981602741..0517b24076 100644 --- a/thirdpart/termsandconditions/models.py +++ b/thirdpart/termsandconditions/models.py @@ -95,7 +95,7 @@ class TermsAndConditions(models.Model): except TermsAndConditions.DoesNotExist: # pragma: nocover terms_list.update({DEFAULT_TERMS_SLUG: TermsAndConditions.create_default_terms()}) - terms_list = OrderedDict(sorted(terms_list.items(), key=lambda t: t[0])) + terms_list = OrderedDict(sorted(list(terms_list.items()), key=lambda t: t[0])) return terms_list @staticmethod diff --git a/thirdpart/termsandconditions/pipeline.py b/thirdpart/termsandconditions/pipeline.py index 0ade7d5d69..4510107291 100644 --- a/thirdpart/termsandconditions/pipeline.py +++ b/thirdpart/termsandconditions/pipeline.py @@ -5,7 +5,7 @@ try: from urllib.parse import urlparse, urlunparse except ImportError: - from urlparse import urlparse, urlunparse + from urllib.parse import urlparse, urlunparse from .models import TermsAndConditions from django.http import HttpResponseRedirect, QueryDict from django.conf import settings diff --git a/thirdpart/termsandconditions/templatetags/terms_tags.py b/thirdpart/termsandconditions/templatetags/terms_tags.py index e8208f86a1..bc7f45ed6b 100644 --- a/thirdpart/termsandconditions/templatetags/terms_tags.py +++ b/thirdpart/termsandconditions/templatetags/terms_tags.py @@ -7,7 +7,7 @@ from django.conf import settings try: from urllib.parse import urlparse except ImportError: - from urlparse import urlparse + from urllib.parse import urlparse register = template.Library() DEFAULT_HTTP_PATH_FIELD = 'PATH_INFO' diff --git a/thirdpart/termsandconditions/tests.py b/thirdpart/termsandconditions/tests.py index c8b8d1c738..a980f1c9db 100644 --- a/thirdpart/termsandconditions/tests.py +++ b/thirdpart/termsandconditions/tests.py @@ -74,22 +74,22 @@ class TermsAndConditionsTests(TestCase): UserTermsAndConditions.objects.create(user=self.user1, terms=self.terms1) UserTermsAndConditions.objects.create(user=self.user2, terms=self.terms3) - self.assertEquals(1.0, self.user1.userterms.get().terms.version_number) - self.assertEquals(1.5, self.user2.userterms.get().terms.version_number) + self.assertEqual(1.0, self.user1.userterms.get().terms.version_number) + self.assertEqual(1.5, self.user2.userterms.get().terms.version_number) - self.assertEquals('user1', self.terms1.users.all()[0].username) + self.assertEqual('user1', self.terms1.users.all()[0].username) # Testing the get_active static method of TermsAndConditions - self.assertEquals(2.0, TermsAndConditions.get_active(slug='site-terms').version_number) - self.assertEquals(1.5, TermsAndConditions.get_active(slug='contrib-terms').version_number) + self.assertEqual(2.0, TermsAndConditions.get_active(slug='site-terms').version_number) + self.assertEqual(1.5, TermsAndConditions.get_active(slug='contrib-terms').version_number) # Testing the agreed_to_latest static method of TermsAndConditions - self.assertEquals(False, TermsAndConditions.agreed_to_latest(user=self.user1, slug='site-terms')) - self.assertEquals(True, TermsAndConditions.agreed_to_latest(user=self.user2, slug='contrib-terms')) + self.assertEqual(False, TermsAndConditions.agreed_to_latest(user=self.user1, slug='site-terms')) + self.assertEqual(True, TermsAndConditions.agreed_to_latest(user=self.user2, slug='contrib-terms')) # Testing the unicode method of TermsAndConditions - self.assertEquals('site-terms-2.00', str(TermsAndConditions.get_active(slug='site-terms'))) - self.assertEquals('contrib-terms-1.50', str(TermsAndConditions.get_active(slug='contrib-terms'))) + self.assertEqual('site-terms-2.00', str(TermsAndConditions.get_active(slug='site-terms'))) + self.assertEqual('contrib-terms-1.50', str(TermsAndConditions.get_active(slug='contrib-terms'))) def test_middleware_redirect(self): """Validate that a user is redirected to the terms accept page if they are logged in, and decorator is on method""" @@ -141,7 +141,7 @@ class TermsAndConditionsTests(TestCase): chained_terms_response = self.client.post('/terms/accept/', {'terms': 2, 'returnTo': '/secure/'}, follow=True) self.assertContains(chained_terms_response, "Contributor") - self.assertEquals(True, TermsAndConditions.agreed_to_latest(user=self.user1, slug='site-terms')) + self.assertEqual(True, TermsAndConditions.agreed_to_latest(user=self.user1, slug='site-terms')) LOGGER.debug('Test /terms/accept/contrib-terms/1.5/ post') accept_version_response = self.client.get('/terms/accept/contrib-terms/1.5/', follow=True) @@ -176,7 +176,7 @@ class TermsAndConditionsTests(TestCase): TermsAndConditions.objects.all().delete() num_terms = TermsAndConditions.objects.count() - self.assertEquals(0, num_terms) + self.assertEqual(0, num_terms) LOGGER.debug('Test user1 login for autocreate') login_response = self.client.login(username='user1', password='user1password') @@ -188,14 +188,14 @@ class TermsAndConditionsTests(TestCase): LOGGER.debug('Test TermsAndConditions Object Was Created') num_terms = TermsAndConditions.objects.count() - self.assertEquals(1, num_terms) + self.assertEqual(1, num_terms) terms = TermsAndConditions.objects.get() - self.assertEquals('site-terms-1.00', str(terms)) + self.assertEqual('site-terms-1.00', str(terms)) LOGGER.debug('Test Not Creating Non-Default TermsAndConditions') non_default_response = self.client.get('/terms/accept/contrib-terms/', follow=True) - self.assertEquals(404, non_default_response.status_code) + self.assertEqual(404, non_default_response.status_code) def test_terms_upgrade(self): """Validate a user is prompted to accept terms again when new version comes out""" diff --git a/thirdpart/termsandconditions/views.py b/thirdpart/termsandconditions/views.py index f3728fd8d2..a670d03279 100644 --- a/thirdpart/termsandconditions/views.py +++ b/thirdpart/termsandconditions/views.py @@ -72,7 +72,7 @@ class AcceptTermsView(CreateView): else: #Get user out of saved pipeline from django-socialauth # no support for social auth right now. assert False, 'TODO' - if self.request.session.has_key('partial_pipeline'): + if 'partial_pipeline' in self.request.session: user_pk = self.request.session['partial_pipeline']['kwargs']['user']['pk'] form.instance.user = User.objects.get(id=user_pk) else: diff --git a/thirdpart/weworkapi/AbstractApi.py b/thirdpart/weworkapi/AbstractApi.py index 7dde5ee81b..acd704a8f8 100644 --- a/thirdpart/weworkapi/AbstractApi.py +++ b/thirdpart/weworkapi/AbstractApi.py @@ -74,7 +74,7 @@ class AbstractApi(object) : if args is None : return url - for key, value in args.items() : + for key, value in list(args.items()) : if '?' in url : url += ('&' + key + '=' + value) else : @@ -103,7 +103,7 @@ class AbstractApi(object) : realUrl = self.__appendToken(url) if DEBUG is True : - print realUrl, args + print(realUrl, args) return requests.post(realUrl, data = json.dumps(args, ensure_ascii = False).encode('utf-8')).json() @@ -111,7 +111,7 @@ class AbstractApi(object) : realUrl = self.__appendToken(url) if DEBUG is True : - print realUrl + print(realUrl) return requests.get(realUrl).json() diff --git a/thirdpart/weworkapi/CorpApi.py b/thirdpart/weworkapi/CorpApi.py index 71ef46ae41..12a610eda6 100644 --- a/thirdpart/weworkapi/CorpApi.py +++ b/thirdpart/weworkapi/CorpApi.py @@ -14,72 +14,72 @@ from .AbstractApi import * CORP_API_TYPE = { - 'GET_ACCESS_TOKEN' : ['/cgi-bin/gettoken', 'GET'], - 'USER_CREATE' : ['/cgi-bin/user/create?access_token=ACCESS_TOKEN', 'POST'], - 'USER_GET' : ['/cgi-bin/user/get?access_token=ACCESS_TOKEN', 'GET'], - 'USER_UPDATE' : ['/cgi-bin/user/update?access_token=ACCESS_TOKEN', 'POST'], - 'USER_DELETE' : ['/cgi-bin/user/delete?access_token=ACCESS_TOKEN', 'GET'], + 'GET_ACCESS_TOKEN': ['/cgi-bin/gettoken', 'GET'], + 'USER_CREATE': ['/cgi-bin/user/create?access_token=ACCESS_TOKEN', 'POST'], + 'USER_GET': ['/cgi-bin/user/get?access_token=ACCESS_TOKEN', 'GET'], + 'USER_UPDATE': ['/cgi-bin/user/update?access_token=ACCESS_TOKEN', 'POST'], + 'USER_DELETE': ['/cgi-bin/user/delete?access_token=ACCESS_TOKEN', 'GET'], 'USER_BATCH_DELETE': ['/cgi-bin/user/batchdelete?access_token=ACCESS_TOKEN', 'POST'], 'USER_SIMPLE_LIST ': ['/cgi-bin/user/simplelist?access_token=ACCESS_TOKEN', 'GET'], - 'USER_LIST' : ['/cgi-bin/user/list?access_token=ACCESS_TOKEN', 'GET'], - 'USERID_TO_OPENID' : ['/cgi-bin/user/convert_to_openid?access_token=ACCESS_TOKEN', 'POST'], - 'OPENID_TO_USERID' : ['/cgi-bin/user/convert_to_userid?access_token=ACCESS_TOKEN', 'POST'], + 'USER_LIST': ['/cgi-bin/user/list?access_token=ACCESS_TOKEN', 'GET'], + 'USERID_TO_OPENID': ['/cgi-bin/user/convert_to_openid?access_token=ACCESS_TOKEN', 'POST'], + 'OPENID_TO_USERID': ['/cgi-bin/user/convert_to_userid?access_token=ACCESS_TOKEN', 'POST'], 'USER_AUTH_SUCCESS': ['/cgi-bin/user/authsucc?access_token=ACCESS_TOKEN', 'GET'], 'DEPARTMENT_CREATE': ['/cgi-bin/department/create?access_token=ACCESS_TOKEN', 'POST'], 'DEPARTMENT_UPDATE': ['/cgi-bin/department/update?access_token=ACCESS_TOKEN', 'POST'], 'DEPARTMENT_DELETE': ['/cgi-bin/department/delete?access_token=ACCESS_TOKEN', 'GET'], - 'DEPARTMENT_LIST' : ['/cgi-bin/department/list?access_token=ACCESS_TOKEN', 'GET'], + 'DEPARTMENT_LIST': ['/cgi-bin/department/list?access_token=ACCESS_TOKEN', 'GET'], - 'TAG_CREATE' : ['/cgi-bin/tag/create?access_token=ACCESS_TOKEN', 'POST'], - 'TAG_UPDATE' : ['/cgi-bin/tag/update?access_token=ACCESS_TOKEN', 'POST'], - 'TAG_DELETE' : ['/cgi-bin/tag/delete?access_token=ACCESS_TOKEN', 'GET'], - 'TAG_GET_USER' : ['/cgi-bin/tag/get?access_token=ACCESS_TOKEN', 'GET'], - 'TAG_ADD_USER' : ['/cgi-bin/tag/addtagusers?access_token=ACCESS_TOKEN', 'POST'], - 'TAG_DELETE_USER' : ['/cgi-bin/tag/deltagusers?access_token=ACCESS_TOKEN', 'POST'], - 'TAG_GET_LIST' : ['/cgi-bin/tag/list?access_token=ACCESS_TOKEN', 'GET'], + 'TAG_CREATE': ['/cgi-bin/tag/create?access_token=ACCESS_TOKEN', 'POST'], + 'TAG_UPDATE': ['/cgi-bin/tag/update?access_token=ACCESS_TOKEN', 'POST'], + 'TAG_DELETE': ['/cgi-bin/tag/delete?access_token=ACCESS_TOKEN', 'GET'], + 'TAG_GET_USER': ['/cgi-bin/tag/get?access_token=ACCESS_TOKEN', 'GET'], + 'TAG_ADD_USER': ['/cgi-bin/tag/addtagusers?access_token=ACCESS_TOKEN', 'POST'], + 'TAG_DELETE_USER': ['/cgi-bin/tag/deltagusers?access_token=ACCESS_TOKEN', 'POST'], + 'TAG_GET_LIST': ['/cgi-bin/tag/list?access_token=ACCESS_TOKEN', 'GET'], - 'BATCH_JOB_GET_RESULT' : ['/cgi-bin/batch/getresult?access_token=ACCESS_TOKEN', 'GET'], + 'BATCH_JOB_GET_RESULT': ['/cgi-bin/batch/getresult?access_token=ACCESS_TOKEN', 'GET'], - 'BATCH_INVITE' : ['/cgi-bin/batch/invite?access_token=ACCESS_TOKEN', 'POST'], + 'BATCH_INVITE': ['/cgi-bin/batch/invite?access_token=ACCESS_TOKEN', 'POST'], - 'AGENT_GET' : ['/cgi-bin/agent/get?access_token=ACCESS_TOKEN', 'GET'], - 'AGENT_SET' : ['/cgi-bin/agent/set?access_token=ACCESS_TOKEN', 'POST'], - 'AGENT_GET_LIST' : ['/cgi-bin/agent/list?access_token=ACCESS_TOKEN', 'GET'], + 'AGENT_GET': ['/cgi-bin/agent/get?access_token=ACCESS_TOKEN', 'GET'], + 'AGENT_SET': ['/cgi-bin/agent/set?access_token=ACCESS_TOKEN', 'POST'], + 'AGENT_GET_LIST': ['/cgi-bin/agent/list?access_token=ACCESS_TOKEN', 'GET'], - 'MENU_CREATE' : ['/cgi-bin/menu/create?access_token=ACCESS_TOKEN', 'POST'], ## TODO - 'MENU_GET' : ['/cgi-bin/menu/get?access_token=ACCESS_TOKEN', 'GET'], - 'MENU_DELETE' : ['/cgi-bin/menu/delete?access_token=ACCESS_TOKEN', 'GET'], + 'MENU_CREATE': ['/cgi-bin/menu/create?access_token=ACCESS_TOKEN', 'POST'], ## TODO + 'MENU_GET': ['/cgi-bin/menu/get?access_token=ACCESS_TOKEN', 'GET'], + 'MENU_DELETE': ['/cgi-bin/menu/delete?access_token=ACCESS_TOKEN', 'GET'], - 'MESSAGE_SEND' : ['/cgi-bin/message/send?access_token=ACCESS_TOKEN', 'POST'], - 'MESSAGE_REVOKE' : ['/cgi-bin/message/revoke?access_token=ACCESS_TOKEN', 'POST'], + 'MESSAGE_SEND': ['/cgi-bin/message/send?access_token=ACCESS_TOKEN', 'POST'], + 'MESSAGE_REVOKE': ['/cgi-bin/message/revoke?access_token=ACCESS_TOKEN', 'POST'], - 'MEDIA_GET' : ['/cgi-bin/media/get?access_token=ACCESS_TOKEN', 'GET'], + 'MEDIA_GET': ['/cgi-bin/media/get?access_token=ACCESS_TOKEN', 'GET'], - 'GET_USER_INFO_BY_CODE' : ['/cgi-bin/user/getuserinfo?access_token=ACCESS_TOKEN', 'GET'], - 'GET_USER_DETAIL' : ['/cgi-bin/user/getuserdetail?access_token=ACCESS_TOKEN', 'POST'], + 'GET_USER_INFO_BY_CODE': ['/cgi-bin/user/getuserinfo?access_token=ACCESS_TOKEN', 'GET'], + 'GET_USER_DETAIL': ['/cgi-bin/user/getuserdetail?access_token=ACCESS_TOKEN', 'POST'], - 'GET_TICKET' : ['/cgi-bin/ticket/get?access_token=ACCESS_TOKEN', 'GET'], - 'GET_JSAPI_TICKET' : ['/cgi-bin/get_jsapi_ticket?access_token=ACCESS_TOKEN', 'GET'], + 'GET_TICKET': ['/cgi-bin/ticket/get?access_token=ACCESS_TOKEN', 'GET'], + 'GET_JSAPI_TICKET': ['/cgi-bin/get_jsapi_ticket?access_token=ACCESS_TOKEN', 'GET'], - 'GET_CHECKIN_OPTION' : ['/cgi-bin/checkin/getcheckinoption?access_token=ACCESS_TOKEN', 'POST'], - 'GET_CHECKIN_DATA' : ['/cgi-bin/checkin/getcheckindata?access_token=ACCESS_TOKEN', 'POST'], + 'GET_CHECKIN_OPTION': ['/cgi-bin/checkin/getcheckinoption?access_token=ACCESS_TOKEN', 'POST'], + 'GET_CHECKIN_DATA': ['/cgi-bin/checkin/getcheckindata?access_token=ACCESS_TOKEN', 'POST'], 'GET_APPROVAL_DATA': ['/cgi-bin/corp/getapprovaldata?access_token=ACCESS_TOKEN', 'POST'], - 'GET_INVOICE_INFO' : ['/cgi-bin/card/invoice/reimburse/getinvoiceinfo?access_token=ACCESS_TOKEN', 'POST'], - 'UPDATE_INVOICE_STATUS' : + 'GET_INVOICE_INFO': ['/cgi-bin/card/invoice/reimburse/getinvoiceinfo?access_token=ACCESS_TOKEN', 'POST'], + 'UPDATE_INVOICE_STATUS': ['/cgi-bin/card/invoice/reimburse/updateinvoicestatus?access_token=ACCESS_TOKEN', 'POST'], - 'BATCH_UPDATE_INVOICE_STATUS' : + 'BATCH_UPDATE_INVOICE_STATUS': ['/cgi-bin/card/invoice/reimburse/updatestatusbatch?access_token=ACCESS_TOKEN', 'POST'], - 'BATCH_GET_INVOICE_INFO' : + 'BATCH_GET_INVOICE_INFO': ['/cgi-bin/card/invoice/reimburse/getinvoiceinfobatch?access_token=ACCESS_TOKEN', 'POST'], - 'APP_CHAT_CREATE' : ['/cgi-bin/appchat/create?access_token=ACCESS_TOKEN', 'POST'], - 'APP_CHAT_GET' : ['/cgi-bin/appchat/get?access_token=ACCESS_TOKEN', 'GET'], - 'APP_CHAT_UPDATE' : ['/cgi-bin/appchat/update?access_token=ACCESS_TOKEN', 'POST'], - 'APP_CHAT_SEND' : ['/cgi-bin/appchat/send?access_token=ACCESS_TOKEN', 'POST'], + 'APP_CHAT_CREATE': ['/cgi-bin/appchat/create?access_token=ACCESS_TOKEN', 'POST'], + 'APP_CHAT_GET': ['/cgi-bin/appchat/get?access_token=ACCESS_TOKEN', 'GET'], + 'APP_CHAT_UPDATE': ['/cgi-bin/appchat/update?access_token=ACCESS_TOKEN', 'POST'], + 'APP_CHAT_SEND': ['/cgi-bin/appchat/send?access_token=ACCESS_TOKEN', 'POST'], - 'MINIPROGRAM_CODE_TO_SESSION_KEY' : ['/cgi-bin/miniprogram/jscode2session?access_token=ACCESS_TOKEN', 'GET'], + 'MINIPROGRAM_CODE_TO_SESSION_KEY': ['/cgi-bin/miniprogram/jscode2session?access_token=ACCESS_TOKEN', 'GET'], } class CorpApi(AbstractApi) : @@ -97,7 +97,7 @@ class CorpApi(AbstractApi) : response = self.httpCall( CORP_API_TYPE['GET_ACCESS_TOKEN'], { - 'corpid' : self.corpid, + 'corpid': self.corpid, 'corpsecret': self.secret, }) self.access_token = response.get('access_token') diff --git a/tools/avatar_migration.py b/tools/avatar_migration.py index 824b73b8d7..fe289546b4 100755 --- a/tools/avatar_migration.py +++ b/tools/avatar_migration.py @@ -16,16 +16,16 @@ import MySQLdb if len(sys.argv) != 2: - seahub_root = raw_input("Please enter root path of seahub: ") + seahub_root = input("Please enter root path of seahub: ") else: seahub_root = sys.argv[1] -host = raw_input("Please enter MySQL host:(leave blank for localhost) ") +host = input("Please enter MySQL host:(leave blank for localhost) ") if not host: host = 'localhost' -user = raw_input("Please enter MySQL user: ") -passwd = raw_input("Please enter password: ") -db = raw_input("Please enter seahub database: ") +user = input("Please enter MySQL user: ") +passwd = input("Please enter password: ") +db = input("Please enter seahub database: ") '''Read user's avatar path from MySQL-avatar_avatar and avatar_groupavatar''' db = MySQLdb.connect(host=host, user=user, passwd=passwd, db=db) @@ -41,14 +41,14 @@ for row in rows: try: statinfo = os.stat(avatar_full_path) except OSError as e: - print e + print(e) continue size = statinfo.st_size mtime = statinfo.st_mtime mtime_str = datetime.datetime.fromtimestamp(int(mtime)).strftime('%Y-%m-%d %H:%M:%S') with file(avatar_full_path) as f: avatar_path = avatar_path.replace('\\', '/') - avatar_path_md5 = hashlib.md5(avatar_path).hexdigest() + avatar_path_md5 = hashlib.md5(avatar_path.encode('utf-8')).hexdigest() binary = f.read() encoded = base64.b64encode(binary) diff --git a/tools/batch-delete.py b/tools/batch-delete.py index 19c3eaeed4..7c7beabfce 100644 --- a/tools/batch-delete.py +++ b/tools/batch-delete.py @@ -22,7 +22,7 @@ def check_settings(): sys.exit(1) def do_create(): - root_passwd = raw_input("Please enter root password to create database %s: " % dbname) + root_passwd = input("Please enter root password to create database %s: " % dbname) conn = MySQLdb.Connect(host='localhost', user='root', passwd=root_passwd) cursor = conn.cursor() @@ -59,5 +59,5 @@ if __name__=="__main__": do_delete(app_name) do_delete('django') - print '[Delete seahub tables...Done]' + print('[Delete seahub tables...Done]') diff --git a/tools/gen-tarball.py b/tools/gen-tarball.py index 3608c9be91..7b9555d1c8 100755 --- a/tools/gen-tarball.py +++ b/tools/gen-tarball.py @@ -6,7 +6,7 @@ import sys import os import tempfile import shutil -import commands +import subprocess import subprocess import atexit import optparse @@ -24,7 +24,7 @@ def highlight(content, is_error=False): return '\x1b[1;32m%s\x1b[m' % content def info(msg): - print highlight('[INFO] ') + msg + print(highlight('[INFO] ') + msg) def exist_in_path(prog): '''Test whether prog exists in system path''' @@ -40,9 +40,9 @@ def exist_in_path(prog): def error(msg=None, usage=None): if msg: - print highlight('[ERROR] ') + msg + print(highlight('[ERROR] ') + msg) if usage: - print usage + print(usage) sys.exit(1) def run(cmdline, cwd=None, env=None, suppress_stdout=False, suppress_stderr=False): @@ -78,14 +78,14 @@ def must_copy(src, dst): '''Copy src to dst, exit on failure''' try: shutil.copy(src, dst) - except Exception, e: + except Exception as e: error('failed to copy %s to %s: %s' % (src, dst, e)) def must_move(src, dst): '''Copy src to dst, exit on failure''' try: shutil.move(src, dst) - except Exception, e: + except Exception as e: error('failed to move %s to %s: %s' % (src, dst, e)) usage = '''\ @@ -109,7 +109,7 @@ def parse_args(): usage = parser.format_help() options, remain = parser.parse_args() if remain or options.version == None or options.branch == None: - print usage + print(usage) sys.exit(1) return options.version, options.branch @@ -123,7 +123,7 @@ def main(): error('django-admin scripts not found in PATH') # Note: we double % to escape it in a format string - latest_commit_info = commands.getoutput('git log --format="%%H" %s -1' % branch) + latest_commit_info = subprocess.getoutput('git log --format="%%H" %s -1' % branch) # begin tmpdir = tempfile.mkdtemp() diff --git a/tools/seahub-admin.py b/tools/seahub-admin.py index aebb04e64f..e5852c43a9 100644 --- a/tools/seahub-admin.py +++ b/tools/seahub-admin.py @@ -14,14 +14,14 @@ if len(sys.argv) >= 2: ccnet_dir = sys.argv[1] else: home_dir = os.path.join(os.path.expanduser('~'), '.ccnet') - ccnet_dir = raw_input("Enter ccnet directory:(leave blank for %s) " % home_dir) + ccnet_dir = input("Enter ccnet directory:(leave blank for %s) " % home_dir) if not ccnet_dir: ccnet_dir = home_dir # Test usermgr.db exists usermgr_db = os.path.join(ccnet_dir, 'PeerMgr/usermgr.db') if not os.path.exists(usermgr_db): - print '%s DOES NOT exist. FAILED' % usermgr_db + print('%s DOES NOT exist. FAILED' % usermgr_db) sys.exit(1) # Connect db @@ -34,57 +34,57 @@ c = conn.cursor() sql = "SELECT email FROM EmailUser WHERE is_staff = 1" try: c.execute(sql) -except sqlite3.Error, e: - print "An error orrured:", e.args[0] +except sqlite3.Error as e: + print("An error orrured:", e.args[0]) sys.exit(1) staff_list = c.fetchall() if staff_list: - print "Admin is already in database. Email as follows: " - print '--------------------' + print("Admin is already in database. Email as follows: ") + print('--------------------') for e in staff_list: - print e[0] - print '--------------------' - choice = raw_input('Previous admin would be deleted, would you like to continue?[y/n] ') + print(e[0]) + print('--------------------') + choice = input('Previous admin would be deleted, would you like to continue?[y/n] ') if choice == 'y': sql = "DELETE FROM EmailUser WHERE is_staff = 1" try: c.execute(sql) - except sqlite3.Error, e: - print "An error orrured:", e.args[0] + except sqlite3.Error as e: + print("An error orrured:", e.args[0]) sys.exit(1) else: - print 'Previous admin is deleted.' + print('Previous admin is deleted.') else: conn.close() sys.exit(0) # Create admin user -choice = raw_input('Would you like to create admin user?[y/n]') +choice = input('Would you like to create admin user?[y/n]') if choice != 'y': conn.close() sys.exit(0) -username = raw_input('E-mail address:') +username = input('E-mail address:') passwd = getpass.getpass('Password:') passwd2 = getpass.getpass('Password (again):') if passwd != passwd2: - print "Two passwords NOT same." + print("Two passwords NOT same.") sys.exit(1) mySha1 = hashlib.sha1() -mySha1.update(passwd) +mySha1.update(passwd.encode('utf-8')) enc_passwd = mySha1.hexdigest() sql = "INSERT INTO EmailUser(email, passwd, is_staff, is_active, ctime) VALUES ('%s', '%s', 1, 1, '%d');" % (username, enc_passwd, time.time()*1000000) try: c = conn.cursor() c.execute(sql) conn.commit() -except sqlite3.Error, e: - print "An error occured:", e.args[0] +except sqlite3.Error as e: + print("An error occured:", e.args[0]) sys.exit(1) else: - print "Admin user created successfully." + print("Admin user created successfully.") # Close db conn.close() diff --git a/tools/secret_key_generator.py b/tools/secret_key_generator.py index de9e08bbcf..0af37b3bdc 100644 --- a/tools/secret_key_generator.py +++ b/tools/secret_key_generator.py @@ -50,4 +50,4 @@ if __name__ == "__main__": fp.write("SECRET_KEY = \"%s\"\n" % key) fp.close() else: - print key + print(key) diff --git a/tools/update-seahub-db_0.9.4_to_0.9.5.py b/tools/update-seahub-db_0.9.4_to_0.9.5.py index 0616540ecf..b9c8117b23 100755 --- a/tools/update-seahub-db_0.9.4_to_0.9.5.py +++ b/tools/update-seahub-db_0.9.4_to_0.9.5.py @@ -11,7 +11,7 @@ if len(sys.argv) != 2: sys.exit(-1) if not os.access(sys.argv[1], os.F_OK): - print("%s does not exist" % sys.argv[1]) + print(("%s does not exist" % sys.argv[1])) sys.exit(-1) conn = sqlite3.connect(sys.argv[1])