1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-09 10:50:24 +00:00

Change sys.maxint to a const value

This commit is contained in:
xiez
2012-08-04 17:11:57 +08:00
parent 13f0d405e0
commit 4153e6255c
4 changed files with 12 additions and 9 deletions

View File

@@ -27,7 +27,8 @@ from seahub.contacts import Contact
from seahub.forms import RepoCreateForm from seahub.forms import RepoCreateForm
import seahub.settings as seahub_settings import seahub.settings as seahub_settings
from seahub.utils import render_error, render_permission_error, gen_token, \ from seahub.utils import render_error, render_permission_error, gen_token, \
validate_group_name, emails2list, set_cur_ctx, calculate_repo_last_modify validate_group_name, emails2list, set_cur_ctx, calculate_repo_last_modify,\
MAX_INT
from seahub.views import myhome from seahub.views import myhome
@login_required @login_required
@@ -71,8 +72,8 @@ def org_info(request, url_prefix):
set_cur_ctx(request, ctx_dict) set_cur_ctx(request, ctx_dict)
org_members = ccnet_threaded_rpc.get_org_emailusers(url_prefix, org_members = ccnet_threaded_rpc.get_org_emailusers(url_prefix,
0, sys.maxint) 0, MAX_INT)
repos = get_org_repos(org.org_id, 0, sys.maxint) repos = get_org_repos(org.org_id, 0, MAX_INT)
calculate_repo_last_modify(repos) calculate_repo_last_modify(repos)
repos.sort(lambda x, y: cmp(y.latest_modify, x.latest_modify)) repos.sort(lambda x, y: cmp(y.latest_modify, x.latest_modify))
@@ -106,7 +107,7 @@ def org_groups(request, url_prefix):
error_msg = e.msg error_msg = e.msg
return render_error(request, error_msg) return render_error(request, error_msg)
groups = get_org_groups(org.org_id, 0, sys.maxint) groups = get_org_groups(org.org_id, 0, MAX_INT)
return render_to_response('organizations/org_groups.html', { return render_to_response('organizations/org_groups.html', {
'org': org, 'org': org,
'groups': groups, 'groups': groups,

View File

@@ -54,6 +54,7 @@ else:
print "Load config from " + CCNET_CONF_PATH print "Load config from " + CCNET_CONF_PATH
CCNET_CONF_PATH = os.path.normpath(os.path.expanduser(CCNET_CONF_PATH)) CCNET_CONF_PATH = os.path.normpath(os.path.expanduser(CCNET_CONF_PATH))
MAX_INT = 2147483647
pool = ccnet.ClientPool(CCNET_CONF_PATH) pool = ccnet.ClientPool(CCNET_CONF_PATH)
ccnet_rpc = ccnet.CcnetRpcClient(pool, req_pool=True) ccnet_rpc = ccnet.CcnetRpcClient(pool, req_pool=True)
@@ -151,7 +152,7 @@ def remove_group_user(user):
def get_org_groups(org_id, start, limit): def get_org_groups(org_id, start, limit):
try: try:
groups = ccnet_threaded_rpc.get_org_groups(org_id, 0, sys.maxint) groups = ccnet_threaded_rpc.get_org_groups(org_id, 0, MAX_INT)
except SearpcError: except SearpcError:
groups = [] groups = []
return groups return groups

View File

@@ -22,6 +22,7 @@ except ImportError:
import settings import settings
EMPTY_SHA1 = '0000000000000000000000000000000000000000' EMPTY_SHA1 = '0000000000000000000000000000000000000000'
MAX_INT = 2147483647
PREVIEW_FILEEXT = { PREVIEW_FILEEXT = {
'Text': ('ac', 'am', 'bat', 'c', 'cc', 'cmake', 'cpp', 'css', 'diff', 'h', 'html', 'htm', 'java', 'js', 'json', 'less', 'make', 'org', 'php', 'pl', 'properties', 'py', 'rb', 'scala', 'script', 'sh', 'sql', 'txt','text', 'tex', 'vi', 'vim', 'xhtml', 'xml'), 'Text': ('ac', 'am', 'bat', 'c', 'cc', 'cmake', 'cpp', 'css', 'diff', 'h', 'html', 'htm', 'java', 'js', 'json', 'less', 'make', 'org', 'php', 'pl', 'properties', 'py', 'rb', 'scala', 'script', 'sh', 'sql', 'txt','text', 'tex', 'vi', 'vim', 'xhtml', 'xml'),

View File

@@ -47,7 +47,7 @@ from utils import render_permission_error, render_error, list_to_string, \
calculate_repo_last_modify, valid_previewed_file, \ calculate_repo_last_modify, valid_previewed_file, \
check_filename_with_rename, get_accessible_repos, EMPTY_SHA1, \ check_filename_with_rename, get_accessible_repos, EMPTY_SHA1, \
get_file_revision_id_size, get_ccnet_server_addr_port, \ get_file_revision_id_size, get_ccnet_server_addr_port, \
gen_file_get_url, emails2list, set_cur_ctx gen_file_get_url, emails2list, set_cur_ctx, MAX_INT
from seahub.profile.models import Profile from seahub.profile.models import Profile
try: try:
from settings import CROCODOC_API_TOKEN from settings import CROCODOC_API_TOKEN
@@ -1333,7 +1333,7 @@ def sys_org_admin(request):
raise Http404 raise Http404
try: try:
orgs = ccnet_threaded_rpc.get_all_orgs(0, sys.maxint) orgs = ccnet_threaded_rpc.get_all_orgs(0, MAX_INT)
except: except:
orgs = [] orgs = []
@@ -1366,11 +1366,11 @@ def org_info(request):
org = request.user.org org = request.user.org
org_members = ccnet_threaded_rpc.get_org_emailusers(org.url_prefix, 0, sys.maxint) org_members = ccnet_threaded_rpc.get_org_emailusers(org.url_prefix, 0, MAX_INT)
for member in org_members: for member in org_members:
member.short_username = member.email.split('@')[0] member.short_username = member.email.split('@')[0]
groups = ccnet_threaded_rpc.get_org_groups(org.org_id, 0, sys.maxint) groups = ccnet_threaded_rpc.get_org_groups(org.org_id, 0, MAX_INT)
return render_to_response('org_info.html', { return render_to_response('org_info.html', {
'org': org, 'org': org,