You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/05/20 13:14:04 UTC
[01/14] allura git commit: [#7878] ticket:771 Add __future__ imports
Repository: allura
Updated Branches:
refs/heads/ib/7878 [created] bffdd182b
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/perf/call_count.py
----------------------------------------------------------------------
diff --git a/scripts/perf/call_count.py b/scripts/perf/call_count.py
index 671e6f2..f67be7a 100755
--- a/scripts/perf/call_count.py
+++ b/scripts/perf/call_count.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import argparse
import json
import logging
@@ -68,7 +72,7 @@ def main(args):
counts = count_page(test, url, verbose=args.verbose,
debug_html=args.debug_html)
- print json.dumps(counts)
+ print(json.dumps(counts))
write_csv(counts, args.id, args.data_file)
test.tearDown()
@@ -116,17 +120,17 @@ def count_page(test, url, verbose=False, debug_html=False):
with LogCapture('stats') as stats, LogCapture('timermiddleware') as calls:
resp = test.app.get(url, extra_environ=dict(username='*anonymous'))
- print url, resp.status
+ print(url, resp.status)
if debug_html:
debug_filename = 'call-{}.html'.format(''.join([random.choice(string.ascii_letters + string.digits)
for n in xrange(10)]))
with open(debug_filename, 'w') as out:
out.write(resp.body)
- print debug_filename
+ print(debug_filename)
if verbose:
for r in calls.records:
- print r.getMessage()
+ print(r.getMessage())
assert len(stats.records) == 1
timings = json.loads(stats.records[0].getMessage())
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/perf/generate-projects.py
----------------------------------------------------------------------
diff --git a/scripts/perf/generate-projects.py b/scripts/perf/generate-projects.py
index 0374969..16fa5ea 100644
--- a/scripts/perf/generate-projects.py
+++ b/scripts/perf/generate-projects.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -28,10 +32,10 @@ def main(start, cnt):
name = 'gen-proj-{}'.format(i)
project = n.register_project(name, admin)
if (i-start) > 0 and (i-start) % 100 == 0:
- print 'Created {} projects'.format(i-start)
- print 'Flushing...'
+ print('Created {} projects'.format(i-start))
+ print('Flushing...')
ThreadLocalORMSession.flush_all()
- print 'Done'
+ print('Done')
if __name__ == '__main__':
import sys
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/perf/md_perf.py
----------------------------------------------------------------------
diff --git a/scripts/perf/md_perf.py b/scripts/perf/md_perf.py
index e8d0f70..d92af2b 100644
--- a/scripts/perf/md_perf.py
+++ b/scripts/perf/md_perf.py
@@ -44,6 +44,10 @@ user 0m12.749s
sys 0m1.112s
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import argparse
import cProfile
@@ -85,24 +89,24 @@ def main(opts):
def render(artifact, md, opts):
start = begin = time.time()
- print "%4s %20s %10s %s" % ('', 'Conversion Time (s)', 'Text Size', 'Post._id')
+ print("%4s %20s %10s %s" % ('', 'Conversion Time (s)', 'Text Size', 'Post._id'))
for i, p in enumerate(artifact.discussion_thread.posts):
text = DUMMYTEXT or p.text
if opts.n and i + 1 not in opts.n:
- print 'Skipping post %s' % str(i + 1)
+ print('Skipping post %s' % str(i + 1))
continue
if opts.profile:
- print 'Profiling post %s' % str(i + 1)
+ print('Profiling post %s' % str(i + 1))
cProfile.runctx('output = md.convert(text)', globals(), locals())
else:
output = md.convert(text)
elapsed = time.time() - start
- print "%4s %1.18f %10s %s" % (i + 1, elapsed, len(text), p._id)
+ print("%4s %1.18f %10s %s" % (i + 1, elapsed, len(text), p._id))
if opts.output:
- print 'Input:', text[:min(300, len(text))]
- print 'Output:', output[:min(MAX_OUTPUT, len(output))]
+ print('Input:', text[:min(300, len(text))])
+ print('Output:', output[:min(MAX_OUTPUT, len(output))])
start = time.time()
- print "Total time:", start - begin
+ print("Total time:", start - begin)
return output
@@ -128,4 +132,4 @@ if __name__ == '__main__':
if opts.compare:
opts.re2 = not opts.re2
out2 = main(opts)
- print 're/re2 outputs match: ', out1 == out2
+ print('re/re2 outputs match: ', out1 == out2)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/perf/sstress.py
----------------------------------------------------------------------
diff --git a/scripts/perf/sstress.py b/scripts/perf/sstress.py
index 3f1a1b1..26bcbce 100644
--- a/scripts/perf/sstress.py
+++ b/scripts/perf/sstress.py
@@ -20,6 +20,10 @@
'''
sstress - an SMTP stress testing tool
'''
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import smtplib
import threading
@@ -43,8 +47,8 @@ def main():
t.join()
end = time.time()
elapsed = end - begin
- print '%d requests completed in %f seconds' % (N, elapsed)
- print '%f requests/second' % (N / elapsed)
+ print('%d requests completed in %f seconds' % (N, elapsed))
+ print('%f requests/second' % (N / elapsed))
def stress():
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/perf/test_git_lcd.py
----------------------------------------------------------------------
diff --git a/scripts/perf/test_git_lcd.py b/scripts/perf/test_git_lcd.py
index 8d75e54..01a1831 100644
--- a/scripts/perf/test_git_lcd.py
+++ b/scripts/perf/test_git_lcd.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import sys
import os
from glob import glob
@@ -42,11 +46,11 @@ def main(repo_dir, sub_dir='', commit=None):
commit = Mock(_id=commit or git.head)
paths = glob(os.path.join(repo_dir, sub_dir, '*'))
paths = [path.replace(repo_dir + '/', '', 1) for path in paths]
- print "Timing LCDs for %s at %s" % (paths, commit._id)
+ print("Timing LCDs for %s at %s" % (paths, commit._id))
with benchmark() as timer:
result = git.last_commit_ids(commit, paths)
pprint(result)
- print "Took %f seconds" % timer['result']
+ print("Took %f seconds" % timer['result'])
if __name__ == '__main__':
main(*sys.argv[1:])
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/prep-scm-sandbox.py
----------------------------------------------------------------------
diff --git a/scripts/prep-scm-sandbox.py b/scripts/prep-scm-sandbox.py
index 414280f..883d4a9 100644
--- a/scripts/prep-scm-sandbox.py
+++ b/scripts/prep-scm-sandbox.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -41,26 +45,26 @@ def main():
sb_host=sb_host,
sb=sb,
veid='%d0%.2d' % (sb_host, sb))
- for sb_host in 5, 6, 7, 9
+ for sb_host in (5, 6, 7, 9)
for sb in range(99)]
new_lines = '\n'.join(new_lines)
found_star = False
with open(SSH_CONFIG, 'w') as fp:
for line in lines:
if not found_star and line.startswith('Host *'):
- print >> fp, new_lines
+ print(new_lines, file=fp)
found_star = True
- print >> fp, line.rstrip()
+ print(line.rstrip(), file=fp)
if not found_star:
- print >> fp, new_lines
+ print(new_lines, file=fp)
os.system("ssh-keygen -t rsa -b 2048 -N '' -f %s" % KEYFILE)
# Generate ldif
pubkey = open(KEYFILE + '.pub').read()
with open(LDIF_FILE, 'w') as fp:
for user in USERS:
- print >> fp, LDIF_TMPL.substitute(
- user=user, pubkey=pubkey)
+ print(LDIF_TMPL.substitute(
+ user=user, pubkey=pubkey), file=fp)
# Update LDAP
assert 0 == os.system('/usr/local/sbin/ldaptool modify -v -f %s' %
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/prepare-allura-tickets-for-import.py
----------------------------------------------------------------------
diff --git a/scripts/prepare-allura-tickets-for-import.py b/scripts/prepare-allura-tickets-for-import.py
index dc6a695..743277b 100644
--- a/scripts/prepare-allura-tickets-for-import.py
+++ b/scripts/prepare-allura-tickets-for-import.py
@@ -16,6 +16,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from itertools import tee, izip, chain
import json
import git
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/project-import.py
----------------------------------------------------------------------
diff --git a/scripts/project-import.py b/scripts/project-import.py
index b42a6fd..ecde35c 100644
--- a/scripts/project-import.py
+++ b/scripts/project-import.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -229,7 +233,7 @@ def create_project(p, nbhd, user, options):
p.admin,
project_name=p.name.name,
private_project=p.private)
- except Exception, e:
+ except Exception as e:
log.exception('[%s] %s' % (worker_name, str(e)))
return 0
else:
@@ -325,7 +329,7 @@ def main(options):
for j in jobs:
j.join()
- if j.exitcode <> 0:
+ if j.exitcode != 0:
return j.exitcode
return 0
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/publicize-neighborhood.py
----------------------------------------------------------------------
diff --git a/scripts/publicize-neighborhood.py b/scripts/publicize-neighborhood.py
index c32d384..1a62aa1 100644
--- a/scripts/publicize-neighborhood.py
+++ b/scripts/publicize-neighborhood.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/recover-user-databases.py
----------------------------------------------------------------------
diff --git a/scripts/recover-user-databases.py b/scripts/recover-user-databases.py
index 5abf6f3..f3d61c6 100644
--- a/scripts/recover-user-databases.py
+++ b/scripts/recover-user-databases.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/rethumb.py
----------------------------------------------------------------------
diff --git a/scripts/rethumb.py b/scripts/rethumb.py
index fa27f32..59ce311 100644
--- a/scripts/rethumb.py
+++ b/scripts/rethumb.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -117,7 +121,7 @@ class RethumbCommand(base.Command):
# Otherwise, we'll take attachment classes belonging to app's
# package
- ep = iter_entry_points('allura', app.tool_name).next()
+ ep = next(iter_entry_points('allura', app.tool_name))
app_package = ep.module_name.split('.', 1)[0]
if app_package == 'allura':
# Apps in allura known to not define own attachment types
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/scrub-allura-data.py
----------------------------------------------------------------------
diff --git a/scripts/scrub-allura-data.py b/scripts/scrub-allura-data.py
index c0e0828..e569710 100644
--- a/scripts/scrub-allura-data.py
+++ b/scripts/scrub-allura-data.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/setup-scm-server.py
----------------------------------------------------------------------
diff --git a/scripts/setup-scm-server.py b/scripts/setup-scm-server.py
index 050122c..77c3bce 100644
--- a/scripts/setup-scm-server.py
+++ b/scripts/setup-scm-server.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/teamforge-import.py
----------------------------------------------------------------------
diff --git a/scripts/teamforge-import.py b/scripts/teamforge-import.py
index 9f601a0..e06b90d 100644
--- a/scripts/teamforge-import.py
+++ b/scripts/teamforge-import.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -132,7 +136,7 @@ def main():
project_ids = [p.id for p in projects.dataRows]
if options.list_project_ids:
- print ' '.join(project_ids)
+ print(' '.join(project_ids))
return
if not os.path.exists(options.output_dir):
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/test-branches-against-tickets.py
----------------------------------------------------------------------
diff --git a/scripts/test-branches-against-tickets.py b/scripts/test-branches-against-tickets.py
index a742f03..1391251 100755
--- a/scripts/test-branches-against-tickets.py
+++ b/scripts/test-branches-against-tickets.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/trac_export.py
----------------------------------------------------------------------
diff --git a/scripts/trac_export.py b/scripts/trac_export.py
index ac90b17..2a3b7cd 100755
--- a/scripts/trac_export.py
+++ b/scripts/trac_export.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
if __name__ == '__main__':
from allura.scripts.trac_export import main
main()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/wiki-copy.py
----------------------------------------------------------------------
diff --git a/scripts/wiki-copy.py b/scripts/wiki-copy.py
index 0692852..52e274f 100644
--- a/scripts/wiki-copy.py
+++ b/scripts/wiki-copy.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import sys
import urllib
@@ -51,17 +55,17 @@ def main():
page_data = urllib.urlopen(from_url).read()
page_json = json.loads(page_data)
if options.debug:
- print page_json['text']
+ print(page_json['text'])
break
resp = oauth_client.request(
to_url, 'POST', body=urllib.urlencode(dict(text=page_json['text'].encode('utf-8'))))
if resp[0]['status'] == '200':
- print "Posted {0} to {1}".format(page_json['title'], to_url)
+ print("Posted {0} to {1}".format(page_json['title'], to_url))
else:
- print "Error posting {0} to {1}: {2} (project may not exist)".format(page_json['title'], to_url, resp[0]['status'])
+ print("Error posting {0} to {1}: {2} (project may not exist)".format(page_json['title'], to_url, resp[0]['status']))
break
except:
- print "Error processing " + p
+ print("Error processing " + p)
raise
@@ -114,8 +118,8 @@ def make_oauth_client(base_url):
# save oauth token for later use
cp.write(open(config_file, 'w'))
- print 'Saving oauth tokens in {} for later re-use'.format(config_file)
- print
+ print('Saving oauth tokens in {} for later re-use'.format(config_file))
+ print()
access_token = oauth.Token(oauth_token, oauth_token_secret)
oauth_client = oauth.Client(consumer, access_token)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/wiki-export.py
----------------------------------------------------------------------
diff --git a/scripts/wiki-export.py b/scripts/wiki-export.py
index 025d3ca..0f8e776 100755
--- a/scripts/wiki-export.py
+++ b/scripts/wiki-export.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import sys
from optparse import OptionParser
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/wiki-post.py
----------------------------------------------------------------------
diff --git a/scripts/wiki-post.py b/scripts/wiki-post.py
index 7e16bb1..1151f81 100755
--- a/scripts/wiki-post.py
+++ b/scripts/wiki-post.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import types
from sys import stdout
import os
@@ -35,7 +39,7 @@ def smart_str(s, encoding='utf-8', strings_only=False, errors='strict'):
This function was borrowed from Django
"""
- if strings_only and isinstance(s, (types.NoneType, int)):
+ if strings_only and isinstance(s, (type(None), int)):
return s
elif not isinstance(s, basestring):
try:
@@ -117,7 +121,7 @@ def main():
url = options.url or config.get('wiki', 'url')
if pagename_given:
url = urljoin(url, urllib.quote(pagename))
- print url
+ print(url)
sign = Signer(token)
params = [('text', markdown)] if method == 'PUT' else []
@@ -128,7 +132,7 @@ def main():
else:
result = urlopen(url + '?' + urlencode(params))
stdout.write(result.read())
- except HTTPError, e:
+ except HTTPError as e:
stdout.write(e.read())
if __name__ == '__main__':
[05/14] allura git commit: [#7878] ticket:771 Add __future__ imports
Posted by je...@apache.org.
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/search.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/search.py b/Allura/allura/lib/search.py
index 2ee9b82..be6755c 100644
--- a/Allura/allura/lib/search.py
+++ b/Allura/allura/lib/search.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/security.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/security.py b/Allura/allura/lib/security.py
index b26a23c..22fee26 100644
--- a/Allura/allura/lib/security.py
+++ b/Allura/allura/lib/security.py
@@ -18,6 +18,10 @@
"""
This module provides the security predicates used in decorating various models.
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
from collections import defaultdict
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/solr.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/solr.py b/Allura/allura/lib/solr.py
index e8d9f7b..6418d04 100644
--- a/Allura/allura/lib/solr.py
+++ b/Allura/allura/lib/solr.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/spam/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/spam/__init__.py b/Allura/allura/lib/spam/__init__.py
index 4bf3917..77a25bb 100644
--- a/Allura/allura/lib/spam/__init__.py
+++ b/Allura/allura/lib/spam/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/spam/akismetfilter.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/spam/akismetfilter.py b/Allura/allura/lib/spam/akismetfilter.py
index 4913970..fece4d0 100644
--- a/Allura/allura/lib/spam/akismetfilter.py
+++ b/Allura/allura/lib/spam/akismetfilter.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/spam/mollomfilter.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/spam/mollomfilter.py b/Allura/allura/lib/spam/mollomfilter.py
index 3651a94..7738e68 100644
--- a/Allura/allura/lib/spam/mollomfilter.py
+++ b/Allura/allura/lib/spam/mollomfilter.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/stats.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/stats.py b/Allura/allura/lib/stats.py
index 9864e30..c04fa7f 100644
--- a/Allura/allura/lib/stats.py
+++ b/Allura/allura/lib/stats.py
@@ -16,6 +16,10 @@
# under the License.
from __future__ import with_statement
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from time import time
from contextlib import contextmanager
from pylons import request
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/utils.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py
index 83950c6..3593872 100644
--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -58,7 +62,7 @@ MARKDOWN_EXTENSIONS = ['.markdown', '.mdown', '.mkdn', '.mkd', '.md']
def permanent_redirect(url):
try:
tg.redirect(url)
- except exc.HTTPFound, err:
+ except exc.HTTPFound as err:
raise exc.HTTPMovedPermanently(location=err.location)
@@ -108,7 +112,7 @@ class lazy_logger(object):
def __getattr__(self, name):
if name.startswith('_'):
- raise AttributeError, name
+ raise AttributeError(name)
return getattr(self._logger, name)
@@ -232,7 +236,7 @@ def chunked_list(l, n):
def chunked_iter(iterable, max_size):
'''return iterable 'chunks' from the iterable of max size max_size'''
eiter = enumerate(iterable)
- keyfunc = lambda (i, x): i // max_size
+ keyfunc = lambda i_x: i_x[0] // max_size
for _, chunk in groupby(eiter, keyfunc):
yield (x for i, x in chunk)
@@ -339,7 +343,7 @@ class AntiSpam(object):
timestamp = self.timestamp
try:
client_ip = ip_address(self.request)
- except (TypeError, AttributeError), err:
+ except (TypeError, AttributeError) as err:
client_ip = '127.0.0.1'
plain = '%d:%s:%s' % (
timestamp, client_ip, pylons.config.get('spinner_secret', 'abcdef'))
@@ -359,17 +363,17 @@ class AntiSpam(object):
if now is None:
now = time.time()
if obj.timestamp > now + 5:
- raise ValueError, 'Post from the future'
+ raise ValueError('Post from the future')
if now - obj.timestamp > 24 * 60 * 60:
- raise ValueError, 'Post from the distant past'
+ raise ValueError('Post from the distant past')
if obj.spinner != obj.make_spinner(obj.timestamp):
- raise ValueError, 'Bad spinner value'
+ raise ValueError('Bad spinner value')
for k in new_params.keys():
new_params[obj.dec(k)] = new_params.pop(k)
for fldno in range(obj.num_honey):
value = new_params.pop('honey%s' % fldno)
if value:
- raise ValueError, 'Value in honeypot field: %s' % value
+ raise ValueError('Value in honeypot field: %s' % value)
return new_params
@classmethod
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/validators.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/validators.py b/Allura/allura/lib/validators.py
index 344af39..6ea70b4 100644
--- a/Allura/allura/lib/validators.py
+++ b/Allura/allura/lib/validators.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -246,7 +250,7 @@ class JsonValidator(fev.FancyValidator):
def _to_python(self, value, state):
try:
json.loads(value)
- except ValueError, e:
+ except ValueError as e:
raise fe.Invalid('Invalid JSON: ' + str(e), value, state)
return value
@@ -258,7 +262,7 @@ class JsonConverter(fev.FancyValidator):
def _to_python(self, value, state):
try:
obj = json.loads(value)
- except ValueError, e:
+ except ValueError as e:
raise fe.Invalid('Invalid JSON: ' + str(e), value, state)
return obj
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/__init__.py b/Allura/allura/lib/widgets/__init__.py
index 6e13a39..32b669c 100644
--- a/Allura/allura/lib/widgets/__init__.py
+++ b/Allura/allura/lib/widgets/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/analytics.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/analytics.py b/Allura/allura/lib/widgets/analytics.py
index c2e85c5..c41f205 100644
--- a/Allura/allura/lib/widgets/analytics.py
+++ b/Allura/allura/lib/widgets/analytics.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/auth_widgets.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/auth_widgets.py b/Allura/allura/lib/widgets/auth_widgets.py
index 22f4429..eedfee6 100644
--- a/Allura/allura/lib/widgets/auth_widgets.py
+++ b/Allura/allura/lib/widgets/auth_widgets.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index 3fe8f6c..819006d 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/form_fields.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py
index 7d94e47..58f407e 100644
--- a/Allura/allura/lib/widgets/form_fields.py
+++ b/Allura/allura/lib/widgets/form_fields.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/forms.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index 27fd242..f7f3faf 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -35,6 +39,7 @@ from allura.lib import plugin
from allura.lib.widgets import form_fields as ffw
from allura.lib import exceptions as forge_exc
from allura import model as M
+from functools import reduce
log = logging.getLogger(__name__)
@@ -232,7 +237,7 @@ class PersonalDataForm(ForgeForm):
options=[ew.Option(py_value=" ", label=" -- Unknown -- ", selected=False)] +
[ew.Option(py_value=c, label=n, selected=False)
for c, n in sorted(country_names.items(),
- key=lambda (k, v): v)],
+ key=lambda k_v: k_v[1])],
attrs={'onchange': 'selectTimezone(this.value)'}),
ew.TextField(
name='city',
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/macros.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/macros.py b/Allura/allura/lib/widgets/macros.py
index 77c329a..330ec26 100644
--- a/Allura/allura/lib/widgets/macros.py
+++ b/Allura/allura/lib/widgets/macros.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/oauth_widgets.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/oauth_widgets.py b/Allura/allura/lib/widgets/oauth_widgets.py
index f04fed8..3308034 100644
--- a/Allura/allura/lib/widgets/oauth_widgets.py
+++ b/Allura/allura/lib/widgets/oauth_widgets.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/project_list.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/project_list.py b/Allura/allura/lib/widgets/project_list.py
index b5aa619..a99af3c 100644
--- a/Allura/allura/lib/widgets/project_list.py
+++ b/Allura/allura/lib/widgets/project_list.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/repo.py b/Allura/allura/lib/widgets/repo.py
index b3cb8dd..b585e3d 100644
--- a/Allura/allura/lib/widgets/repo.py
+++ b/Allura/allura/lib/widgets/repo.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/search.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/search.py b/Allura/allura/lib/widgets/search.py
index 32014c4..467c3a8 100644
--- a/Allura/allura/lib/widgets/search.py
+++ b/Allura/allura/lib/widgets/search.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/subscriptions.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/subscriptions.py b/Allura/allura/lib/widgets/subscriptions.py
index dec1274..cf3ea8d 100644
--- a/Allura/allura/lib/widgets/subscriptions.py
+++ b/Allura/allura/lib/widgets/subscriptions.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/user_profile.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/user_profile.py b/Allura/allura/lib/widgets/user_profile.py
index c2e32e3..7990edc 100644
--- a/Allura/allura/lib/widgets/user_profile.py
+++ b/Allura/allura/lib/widgets/user_profile.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/widgets/vote.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/vote.py b/Allura/allura/lib/widgets/vote.py
index 4a8cae9..f29625f 100644
--- a/Allura/allura/lib/widgets/vote.py
+++ b/Allura/allura/lib/widgets/vote.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/zarkov_helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/zarkov_helpers.py b/Allura/allura/lib/zarkov_helpers.py
index 2f136f2..bec3b35 100644
--- a/Allura/allura/lib/zarkov_helpers.py
+++ b/Allura/allura/lib/zarkov_helpers.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/__init__.py b/Allura/allura/model/__init__.py
index 784d1af..df21621 100644
--- a/Allura/allura/model/__init__.py
+++ b/Allura/allura/model/__init__.py
@@ -18,6 +18,10 @@
# under the License.
"""The application's model objects"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from .neighborhood import Neighborhood, NeighborhoodFile
from .project import Project, ProjectCategory, TroveCategory, ProjectFile, AppConfig
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index 32ebc10..f6ba5f0 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -43,7 +47,7 @@ from .types import ACL, MarkdownCache
from .project import AppConfig
from .notification import MailFooter
-from filesystem import File
+from .filesystem import File
log = logging.getLogger(__name__)
@@ -129,7 +133,7 @@ class Artifact(MappedClass, SearchIndexable):
@classmethod
def attachment_class(cls):
- raise NotImplementedError, 'attachment_class'
+ raise NotImplementedError('attachment_class')
@LazyProperty
def ref(self):
@@ -315,7 +319,7 @@ class Artifact(MappedClass, SearchIndexable):
Subclasses must implement this.
"""
- raise NotImplementedError, 'url' # pragma no cover
+ raise NotImplementedError('url') # pragma no cover
def shorthand_id(self):
"""How to refer to this artifact within the app instance context.
@@ -448,7 +452,7 @@ class Snapshot(Artifact):
return result
def original(self):
- raise NotImplemented, 'original' # pragma no cover
+ raise NotImplemented('original') # pragma no cover
def shorthand_id(self):
return '%s#%s' % (self.original().shorthand_id(), self.version)
@@ -529,7 +533,7 @@ class VersionedArtifact(Artifact):
self.__class__.__name__),
version=n)
if ss is None:
- raise IndexError, n
+ raise IndexError(n)
return ss
def revert(self, version):
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/attachments.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/attachments.py b/Allura/allura/model/attachments.py
index 568f5b0..d6af2b2 100644
--- a/Allura/allura/model/attachments.py
+++ b/Allura/allura/model/attachments.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
index bc16649..99b4525 100644
--- a/Allura/allura/model/auth.py
+++ b/Allura/allura/model/auth.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -38,7 +42,7 @@ from ming.orm.declarative import MappedClass
from ming.orm.ormsession import ThreadLocalORMSession
from ming.utils import LazyProperty
-import types
+from . import types
import allura.tasks.mail_tasks
from allura.lib import helpers as h
from allura.lib import plugin
@@ -61,7 +65,7 @@ def smart_str(s, encoding='utf-8', strings_only=False, errors='strict'):
This function was borrowed from Django
"""
- if strings_only and isinstance(s, (types.NoneType, int)):
+ if strings_only and isinstance(s, (type(None), int)):
return s
elif not isinstance(s, basestring):
try:
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 581eb21..3d12d21 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/filesystem.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/filesystem.py b/Allura/allura/model/filesystem.py
index af1dea1..25cc698 100644
--- a/Allura/allura/model/filesystem.py
+++ b/Allura/allura/model/filesystem.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/index.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/index.py b/Allura/allura/model/index.py
index 61a036a..cd4be6e 100644
--- a/Allura/allura/model/index.py
+++ b/Allura/allura/model/index.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/monq_model.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/monq_model.py b/Allura/allura/model/monq_model.py
index 7f25a4f..4aa49c1 100644
--- a/Allura/allura/model/monq_model.py
+++ b/Allura/allura/model/monq_model.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -199,7 +203,7 @@ class MonQTask(MappedClass):
sort=sort)
if obj is not None:
return obj
- except pymongo.errors.OperationFailure, exc:
+ except pymongo.errors.OperationFailure as exc:
if 'No matching object found' not in exc.args[0]:
raise
if waitfunc is None:
@@ -260,7 +264,7 @@ class MonQTask(MappedClass):
self.result = func(*self.args, **self.kwargs)
self.state = 'complete'
return self.result
- except Exception, exc:
+ except Exception as exc:
if asbool(config.get('monq.raise_errors')):
raise
else:
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/neighborhood.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/neighborhood.py b/Allura/allura/model/neighborhood.py
index f46fc59..ae739f5 100644
--- a/Allura/allura/model/neighborhood.py
+++ b/Allura/allura/model/neighborhood.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/notification.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/notification.py b/Allura/allura/model/notification.py
index 4241c42..f8bf870 100644
--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -33,6 +33,10 @@ Periodically:
- Clear subscription's notification list
'''
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
from bson import ObjectId
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/oauth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/oauth.py b/Allura/allura/model/oauth.py
index fb395f5..1e0953b 100644
--- a/Allura/allura/model/oauth.py
+++ b/Allura/allura/model/oauth.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index db460a1..2f113b4 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -53,7 +57,7 @@ from .timeline import ActivityNode, ActivityObject
from .types import ACL, ACE
from .monq_model import MonQTask
-from filesystem import File
+from .filesystem import File
log = logging.getLogger(__name__)
@@ -785,7 +789,7 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
provider.shortname_validator.to_python(
name, check_allowed=False, neighborhood=self.neighborhood)
except exceptions.Invalid:
- raise exceptions.ToolError, 'Mount point "%s" is invalid' % name
+ raise exceptions.ToolError('Mount point "%s" is invalid' % name)
return provider.register_subproject(self, name, user or c.user, install_apps, project_name=project_name)
def ordered_mounts(self, include_hidden=False):
@@ -963,8 +967,8 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
def social_account(self, socialnetwork):
try:
- account = (
- sn for sn in self.socialnetworks if sn.socialnetwork == socialnetwork).next()
+ account = next((
+ sn for sn in self.socialnetworks if sn.socialnetwork == socialnetwork))
except StopIteration:
return None
else:
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repo.py b/Allura/allura/model/repo.py
index f041116..19fa532 100644
--- a/Allura/allura/model/repo.py
+++ b/Allura/allura/model/repo.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/repo_refresh.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repo_refresh.py b/Allura/allura/model/repo_refresh.py
index 1711bc3..117a559 100644
--- a/Allura/allura/model/repo_refresh.py
+++ b/Allura/allura/model/repo_refresh.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -72,7 +76,7 @@ def refresh_repo(repo, all_commits=False, notify=True, new_clone=False):
# Refresh child references
for i, oid in enumerate(commit_ids):
- ci = CommitDoc.m.find(dict(_id=oid), validate=False).next()
+ ci = next(CommitDoc.m.find(dict(_id=oid), validate=False))
refresh_children(ci)
if (i + 1) % 100 == 0:
log.info('Refresh child info %d for parents of %s',
@@ -103,7 +107,7 @@ def refresh_repo(repo, all_commits=False, notify=True, new_clone=False):
if repo._refresh_precompute:
cache = {}
for i, oid in enumerate(commit_ids):
- ci = CommitDoc.m.find(dict(_id=oid), validate=False).next()
+ ci = next(CommitDoc.m.find(dict(_id=oid), validate=False))
cache = refresh_commit_trees(ci, cache)
if (i + 1) % 100 == 0:
log.info('Refresh commit trees %d: %s', (i + 1), ci._id)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index e4583e5..d720377 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -1571,7 +1575,7 @@ class LastCommit(RepoObject):
@classmethod
def _last_commit_id(cls, commit, path):
try:
- rev = commit.repo.log(commit._id, path, id_only=True).next()
+ rev = next(commit.repo.log(commit._id, path, id_only=True))
return commit.repo.rev_to_commit_id(rev)
except StopIteration:
log.error('Tree node not recognized by SCM: %s @ %s',
@@ -1587,8 +1591,8 @@ class LastCommit(RepoObject):
return lcid_cache[path]
try:
log_iter = commit.repo.log(commit._id, path, id_only=True)
- log_iter.next()
- rev = log_iter.next()
+ next(log_iter)
+ rev = next(log_iter)
return commit.repo.rev_to_commit_id(rev)
except StopIteration:
return None
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/session.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/session.py b/Allura/allura/model/session.py
index eb1f4ba..dea681f 100644
--- a/Allura/allura/model/session.py
+++ b/Allura/allura/model/session.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/stats.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/stats.py b/Allura/allura/model/stats.py
index cbb71dd..1668f45 100644
--- a/Allura/allura/model/stats.py
+++ b/Allura/allura/model/stats.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -27,6 +31,7 @@ from datetime import timedelta
import difflib
from allura.model.session import main_orm_session
+from functools import reduce
class Stats(MappedClass):
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/timeline.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/timeline.py b/Allura/allura/model/timeline.py
index e9d9d99..9d76d4b 100644
--- a/Allura/allura/model/timeline.py
+++ b/Allura/allura/model/timeline.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/types.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/types.py b/Allura/allura/model/types.py
index 6a8ff71..e630096 100644
--- a/Allura/allura/model/types.py
+++ b/Allura/allura/model/types.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/model/webhook.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/webhook.py b/Allura/allura/model/webhook.py
index bb36e5f..6104a03 100644
--- a/Allura/allura/model/webhook.py
+++ b/Allura/allura/model/webhook.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/scripts/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/__init__.py b/Allura/allura/scripts/__init__.py
index 35779cc..1da8151 100644
--- a/Allura/allura/scripts/__init__.py
+++ b/Allura/allura/scripts/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,4 +19,4 @@
# specific language governing permissions and limitations
# under the License.
-from scripttask import ScriptTask
+from .scripttask import ScriptTask
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/scripts/refresh_last_commits.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/refresh_last_commits.py b/Allura/allura/scripts/refresh_last_commits.py
index 095fafb..d1b5632 100644
--- a/Allura/allura/scripts/refresh_last_commits.py
+++ b/Allura/allura/scripts/refresh_last_commits.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -142,11 +146,11 @@ class RefreshLastCommits(ScriptTask):
)
lcid_cache = {}
timings = []
- print 'Processing last commits'
+ print('Processing last commits')
for i, commit_id in enumerate(commit_ids):
commit = M.repository.Commit.query.get(_id=commit_id)
if commit is None:
- print "Commit missing, skipping: %s" % commit_id
+ print("Commit missing, skipping: %s" % commit_id)
continue
commit.set_context(c.app.repo)
with time(timings):
@@ -173,8 +177,8 @@ class RefreshLastCommits(ScriptTask):
tt = sum(timings)
at = tt / len(timings)
mat = sum(timings[-debug_step:]) / debug_step
- print ' Processed %d commits (max: %f, avg: %f, mavg: %f, tot: %f)' % (
- processed, mt, at, mat, tt)
+ print(' Processed %d commits (max: %f, avg: %f, mavg: %f, tot: %f)' % (
+ processed, mt, at, mat, tt))
@contextmanager
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/scripts/refreshrepo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/refreshrepo.py b/Allura/allura/scripts/refreshrepo.py
index a336b0d..15520a8 100644
--- a/Allura/allura/scripts/refreshrepo.py
+++ b/Allura/allura/scripts/refreshrepo.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/scripts/reindex_projects.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/reindex_projects.py b/Allura/allura/scripts/reindex_projects.py
index 89c447e..2c51d43 100644
--- a/Allura/allura/scripts/reindex_projects.py
+++ b/Allura/allura/scripts/reindex_projects.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -61,7 +65,7 @@ class ReindexProjects(ScriptTask):
cls._post_add_projects(chunk)
else:
add_projects(chunk)
- except CompoundError, err:
+ except CompoundError as err:
log.exception('Error indexing projects:\n%r', err)
log.error('%s', err.format_error())
M.main_orm_session.flush()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/scripts/reindex_users.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/reindex_users.py b/Allura/allura/scripts/reindex_users.py
index 8a0762b..4dc03aa 100644
--- a/Allura/allura/scripts/reindex_users.py
+++ b/Allura/allura/scripts/reindex_users.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -47,7 +51,7 @@ class ReindexUsers(ScriptTask):
cls._post_add_users(chunk)
else:
add_users(chunk)
- except CompoundError, err:
+ except CompoundError as err:
log.exception('Error indexing users:\n%r', err)
log.error('%s', err.format_error())
M.main_orm_session.flush()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/scripts/remove_duplicate_troves.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/remove_duplicate_troves.py b/Allura/allura/scripts/remove_duplicate_troves.py
index 7866b2e..30ca505 100644
--- a/Allura/allura/scripts/remove_duplicate_troves.py
+++ b/Allura/allura/scripts/remove_duplicate_troves.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/scripts/scripttask.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/scripttask.py b/Allura/allura/scripts/scripttask.py
index a8494c9..f3d6e6e 100644
--- a/Allura/allura/scripts/scripttask.py
+++ b/Allura/allura/scripts/scripttask.py
@@ -43,6 +43,10 @@ To call as a task::
MyScript.post('-p myproject --dry-run')
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import argparse
import logging
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/scripts/trac_export.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/trac_export.py b/Allura/allura/scripts/trac_export.py
index 8b6419d..4bcc7d6 100644
--- a/Allura/allura/scripts/trac_export.py
+++ b/Allura/allura/scripts/trac_export.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
import sys
import csv
@@ -120,7 +124,7 @@ class TracExport(object):
def log_url(self, url):
log.info(url)
if self.verbose:
- print >>sys.stderr, url
+ print(url, file=sys.stderr)
@classmethod
def trac2z_date(cls, s):
@@ -151,7 +155,7 @@ class TracExport(object):
url = self.full_url(self.TICKET_URL % id, 'csv')
f = self.csvopen(url)
reader = csv.DictReader(f)
- ticket_fields = reader.next()
+ ticket_fields = next(reader)
ticket_fields['class'] = 'ARTIFACT'
ticket = self.remap_fields(ticket_fields)
@@ -224,8 +228,8 @@ class TracExport(object):
url = self.full_url(self.QUERY_MAX_ID_URL, 'csv')
f = self.csvopen(url)
reader = csv.DictReader(f)
- fields = reader.next()
- print fields
+ fields = next(reader)
+ print(fields)
return int(fields['id'])
def get_ticket(self, id, extra={}):
@@ -250,14 +254,14 @@ class TracExport(object):
url = self.full_url(self.QUERY_BY_PAGE_URL % self.page, 'csv')
try:
f = self.csvopen(url)
- except urllib2.HTTPError, e:
+ except urllib2.HTTPError as e:
if 'emulated' in e.msg:
body = e.fp.read()
if 'beyond the number of pages in the query' in body or 'Log in with a SourceForge account' in body:
raise StopIteration
raise
reader = csv.reader(f)
- cols = reader.next()
+ cols = next(reader)
for r in reader:
if r and r[0].isdigit():
id = int(r[0])
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/scripts/trim_emails.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/trim_emails.py b/Allura/allura/scripts/trim_emails.py
index f847224..6e7f542 100644
--- a/Allura/allura/scripts/trim_emails.py
+++ b/Allura/allura/scripts/trim_emails.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/scripts/update_checkout_url.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/update_checkout_url.py b/Allura/allura/scripts/update_checkout_url.py
index a1fc982..8bf115f 100644
--- a/Allura/allura/scripts/update_checkout_url.py
+++ b/Allura/allura/scripts/update_checkout_url.py
@@ -19,6 +19,10 @@
Find repos with blank checkout url and top-level "trunk" dir,
and point checkout_url at trunk.
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tasks/activity_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/activity_tasks.py b/Allura/allura/tasks/activity_tasks.py
index 26ac02a..f25f69e 100644
--- a/Allura/allura/tasks/activity_tasks.py
+++ b/Allura/allura/tasks/activity_tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tasks/admin_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/admin_tasks.py b/Allura/allura/tasks/admin_tasks.py
index 65f2775..7056c83 100644
--- a/Allura/allura/tasks/admin_tasks.py
+++ b/Allura/allura/tasks/admin_tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tasks/event_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/event_tasks.py b/Allura/allura/tasks/event_tasks.py
index 8a2de35..5ddfeaf 100644
--- a/Allura/allura/tasks/event_tasks.py
+++ b/Allura/allura/tasks/event_tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tasks/export_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/export_tasks.py b/Allura/allura/tasks/export_tasks.py
index eb9ff4d..1ea0b0d 100644
--- a/Allura/allura/tasks/export_tasks.py
+++ b/Allura/allura/tasks/export_tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tasks/index_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/index_tasks.py b/Allura/allura/tasks/index_tasks.py
index c9e853d..e4fbbec 100644
--- a/Allura/allura/tasks/index_tasks.py
+++ b/Allura/allura/tasks/index_tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tasks/mail_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/mail_tasks.py b/Allura/allura/tasks/mail_tasks.py
index 2547291..ed95fc5 100644
--- a/Allura/allura/tasks/mail_tasks.py
+++ b/Allura/allura/tasks/mail_tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -78,7 +82,7 @@ def route_email(
c.app.handle_message(userpart, msg)
else:
c.app.handle_message(userpart, msg)
- except exc.MailError, e:
+ except exc.MailError as e:
log.error('Error routing email to %s: %s', addr, e)
except:
log.exception('Error routing mail to %s', addr)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tasks/notification_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/notification_tasks.py b/Allura/allura/tasks/notification_tasks.py
index a6b7564..2244b46 100644
--- a/Allura/allura/tasks/notification_tasks.py
+++ b/Allura/allura/tasks/notification_tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tasks/repo_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/repo_tasks.py b/Allura/allura/tasks/repo_tasks.py
index e44ea94..d747867 100644
--- a/Allura/allura/tasks/repo_tasks.py
+++ b/Allura/allura/tasks/repo_tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/templates/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/__init__.py b/Allura/allura/templates/__init__.py
index 8109045..4c0b4ac 100644
--- a/Allura/allura/templates/__init__.py
+++ b/Allura/allura/templates/__init__.py
@@ -18,3 +18,7 @@
# under the License.
"""Templates package for the application."""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/__init__.py b/Allura/allura/tests/__init__.py
index 8047c6b..14e03bf 100644
--- a/Allura/allura/tests/__init__.py
+++ b/Allura/allura/tests/__init__.py
@@ -18,6 +18,10 @@
# under the License.
"""Unit and functional test suite for allura."""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import alluratest.controller
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/decorators.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/decorators.py b/Allura/allura/tests/decorators.py
index 46369d1..635e03a 100644
--- a/Allura/allura/tests/decorators.py
+++ b/Allura/allura/tests/decorators.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/__init__.py b/Allura/allura/tests/functional/__init__.py
index 40a4394..ba896c1 100644
--- a/Allura/allura/tests/functional/__init__.py
+++ b/Allura/allura/tests/functional/__init__.py
@@ -18,3 +18,7 @@
# under the License.
"""Functional test suite for the controllers of the application."""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 819a92a..59be6fd 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -467,10 +471,10 @@ class TestProjectAdmin(TestController):
'new.mount_label': 'sub-del-undel'})
r = self.app.get('/p/test/admin/overview')
assert 'This project has been deleted and is not visible to non-admin users' not in r
- assert r.html.find(
- 'input', {'name': 'removal', 'value': ''}).has_key('checked')
- assert not r.html.find(
- 'input', {'name': 'removal', 'value': 'deleted'}).has_key('checked')
+ assert 'checked' in r.html.find(
+ 'input', {'name': 'removal', 'value': ''})
+ assert 'checked' not in r.html.find(
+ 'input', {'name': 'removal', 'value': 'deleted'})
with audits('delete project'):
self.app.post('/admin/update', params=dict(
name='Test Project',
@@ -480,10 +484,10 @@ class TestProjectAdmin(TestController):
delete='on'))
r = self.app.get('/p/test/admin/overview')
assert 'This project has been deleted and is not visible to non-admin users' in r
- assert not r.html.find(
- 'input', {'name': 'removal', 'value': ''}).has_key('checked')
- assert r.html.find(
- 'input', {'name': 'removal', 'value': 'deleted'}).has_key('checked')
+ assert 'checked' not in r.html.find(
+ 'input', {'name': 'removal', 'value': ''})
+ assert 'checked' in r.html.find(
+ 'input', {'name': 'removal', 'value': 'deleted'})
# make sure subprojects get deleted too
r = self.app.get('/p/test/sub-del-undel/admin/overview')
assert 'This project has been deleted and is not visible to non-admin users' in r
@@ -496,10 +500,10 @@ class TestProjectAdmin(TestController):
undelete='on'))
r = self.app.get('/p/test/admin/overview')
assert 'This project has been deleted and is not visible to non-admin users' not in r
- assert r.html.find(
- 'input', {'name': 'removal', 'value': ''}).has_key('checked')
- assert not r.html.find(
- 'input', {'name': 'removal', 'value': 'deleted'}).has_key('checked')
+ assert 'checked' in r.html.find(
+ 'input', {'name': 'removal', 'value': ''})
+ assert 'checked' not in r.html.find(
+ 'input', {'name': 'removal', 'value': 'deleted'})
def test_project_delete_not_allowed(self):
# turn off project delete option
@@ -544,8 +548,8 @@ class TestProjectAdmin(TestController):
delete='on'))
r = self.app.get('/p/test/sub-no-del/admin/overview')
assert 'This project has been deleted and is not visible to non-admin users' in r
- assert r.html.find(
- 'input', {'name': 'removal', 'value': 'deleted'}).has_key('checked')
+ assert 'checked' in r.html.find(
+ 'input', {'name': 'removal', 'value': 'deleted'})
finally:
if old_allow_project_delete == ():
del config['allow_project_delete']
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_auth.py b/Allura/allura/tests/functional/test_auth.py
index 0f9a8ee..3bdf1a3 100644
--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_discuss.py b/Allura/allura/tests/functional/test_discuss.py
index 31e454e..8092595 100644
--- a/Allura/allura/tests/functional/test_discuss.py
+++ b/Allura/allura/tests/functional/test_discuss.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -63,9 +67,8 @@ class TestDiscuss(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = text
r = self.app.post(f['action'].encode('utf-8'), params=params,
headers={'Referer': thread_link.encode("utf-8")},
@@ -88,9 +91,8 @@ class TestDiscuss(TestController):
params = dict()
inputs = post_form.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[post_form.find('textarea')['name']] = 'This is a new post'
r = self.app.post(post_link,
params=params,
@@ -103,9 +105,8 @@ class TestDiscuss(TestController):
params = dict()
inputs = post_form.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[post_form.find('textarea')['name']] = 'Tis a reply'
r = self.app.post(post_link + 'reply',
params=params,
@@ -214,9 +215,8 @@ class TestDiscuss(TestController):
params = dict()
inputs = reply_form.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[reply_form.find('textarea')['name']] = 'zzz'
self.app.post(post_link, params)
assert create_activity.call_count == 1, create_activity.call_count
@@ -243,9 +243,8 @@ class TestAttachment(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'Test Post'
r = self.app.post(f['action'].encode('utf-8'), params=params,
headers={'Referer': self.thread_link})
@@ -279,9 +278,8 @@ class TestAttachment(TestController):
inputs = post_form.findAll('input')
for field in inputs:
- if field.has_key('name') and (field['name'] != 'file_info'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field and (field['name'] != 'file_info'):
+ params[field['name']] = 'value' in field and field['value'] or ''
params[post_form.find('textarea')['name']] = 'Reply'
r = self.app.post(self.post_link + 'reply',
params=params,
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_feeds.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_feeds.py b/Allura/allura/tests/functional/test_feeds.py
index 54416a5..b244ba2 100644
--- a/Allura/allura/tests/functional/test_feeds.py
+++ b/Allura/allura/tests/functional/test_feeds.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_gravatar.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_gravatar.py b/Allura/allura/tests/functional/test_gravatar.py
index bea43f3..fe2fc9b 100644
--- a/Allura/allura/tests/functional/test_gravatar.py
+++ b/Allura/allura/tests/functional/test_gravatar.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_home.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_home.py b/Allura/allura/tests/functional/test_home.py
index 58f1d61..bc3ad18 100644
--- a/Allura/allura/tests/functional/test_home.py
+++ b/Allura/allura/tests/functional/test_home.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_neighborhood.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_neighborhood.py b/Allura/allura/tests/functional/test_neighborhood.py
index afe4dc6..74728df 100644
--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_rest.py b/Allura/allura/tests/functional/test_rest.py
index 43a92d1..02934b0 100644
--- a/Allura/allura/tests/functional/test_rest.py
+++ b/Allura/allura/tests/functional/test_rest.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from pylons import app_globals as g
import mock
from nose.tools import assert_equal, assert_in, assert_not_in
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_root.py b/Allura/allura/tests/functional/test_root.py
index 8f29b31..e2aac1f 100644
--- a/Allura/allura/tests/functional/test_root.py
+++ b/Allura/allura/tests/functional/test_root.py
@@ -28,6 +28,10 @@ functional tests exercise the whole application and its WSGI stack.
Please read http://pythonpaste.org/webtest/ for more information.
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from pylons import tmpl_context as c
from nose.tools import assert_equal
from ming.orm.ormsession import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_search.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_search.py b/Allura/allura/tests/functional/test_search.py
index 374d5f3..50c0cfb 100644
--- a/Allura/allura/tests/functional/test_search.py
+++ b/Allura/allura/tests/functional/test_search.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_site_admin.py b/Allura/allura/tests/functional/test_site_admin.py
index e89b9fd..754313a 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -16,6 +16,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import json
import datetime as dt
@@ -156,7 +160,7 @@ class TestSiteAdmin(TestController):
user='root',
path='/p/test/admin',
), status=302)
- task = M.MonQTask.query.find({}).sort('_id', -1).next()
+ task = next(M.MonQTask.query.find({}).sort('_id', -1))
assert str(task._id) in r.location
assert task.context['project_id'] == project._id
assert task.context['app_config_id'] == app.config._id
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_static.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_static.py b/Allura/allura/tests/functional/test_static.py
index 49e9295..5a69189 100644
--- a/Allura/allura/tests/functional/test_static.py
+++ b/Allura/allura/tests/functional/test_static.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_subscriber.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_subscriber.py b/Allura/allura/tests/functional/test_subscriber.py
index 93b822e..67c2e39 100644
--- a/Allura/allura/tests/functional/test_subscriber.py
+++ b/Allura/allura/tests/functional/test_subscriber.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_tool_list.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_tool_list.py b/Allura/allura/tests/functional/test_tool_list.py
index 08607cf..44e83e5 100644
--- a/Allura/allura/tests/functional/test_tool_list.py
+++ b/Allura/allura/tests/functional/test_tool_list.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_trovecategory.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_trovecategory.py b/Allura/allura/tests/functional/test_trovecategory.py
index 64992a7..3284711 100644
--- a/Allura/allura/tests/functional/test_trovecategory.py
+++ b/Allura/allura/tests/functional/test_trovecategory.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/functional/test_user_profile.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_user_profile.py b/Allura/allura/tests/functional/test_user_profile.py
index c539baf..8841093 100644
--- a/Allura/allura/tests/functional/test_user_profile.py
+++ b/Allura/allura/tests/functional/test_user_profile.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/model/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/__init__.py b/Allura/allura/tests/model/__init__.py
index c194980..39c107f 100644
--- a/Allura/allura/tests/model/__init__.py
+++ b/Allura/allura/tests/model/__init__.py
@@ -18,3 +18,7 @@
# under the License.
"""Model test suite for the models of the application."""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/model/test_artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_artifact.py b/Allura/allura/tests/model/test_artifact.py
index b6d6832..fb6ee43 100644
--- a/Allura/allura/tests/model/test_artifact.py
+++ b/Allura/allura/tests/model/test_artifact.py
@@ -20,6 +20,10 @@
"""
Model tests for artifact
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import re
from datetime import datetime
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/model/test_auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_auth.py b/Allura/allura/tests/model/test_auth.py
index 5d1841b..1660da4 100644
--- a/Allura/allura/tests/model/test_auth.py
+++ b/Allura/allura/tests/model/test_auth.py
@@ -20,6 +20,10 @@
"""
Model tests for auth
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from nose.tools import (
with_setup,
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/model/test_discussion.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_discussion.py b/Allura/allura/tests/model/test_discussion.py
index 1768777..4a1ad54 100644
--- a/Allura/allura/tests/model/test_discussion.py
+++ b/Allura/allura/tests/model/test_discussion.py
@@ -20,6 +20,10 @@
"""
Model tests for artifact
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from cStringIO import StringIO
import time
from datetime import datetime, timedelta
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/model/test_filesystem.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_filesystem.py b/Allura/allura/tests/model/test_filesystem.py
index 1f4c1da..8e8bd38 100644
--- a/Allura/allura/tests/model/test_filesystem.py
+++ b/Allura/allura/tests/model/test_filesystem.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
from unittest import TestCase
from cStringIO import StringIO
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/model/test_monq.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_monq.py b/Allura/allura/tests/model/test_monq.py
index 4ba2f0b..055bb91 100644
--- a/Allura/allura/tests/model/test_monq.py
+++ b/Allura/allura/tests/model/test_monq.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/model/test_neighborhood.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_neighborhood.py b/Allura/allura/tests/model/test_neighborhood.py
index c18b608..a9967c4 100644
--- a/Allura/allura/tests/model/test_neighborhood.py
+++ b/Allura/allura/tests/model/test_neighborhood.py
@@ -20,6 +20,10 @@
"""
Model tests for neighborhood
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from nose.tools import with_setup
from allura import model as M
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/model/test_notification.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_notification.py b/Allura/allura/tests/model/test_notification.py
index ac7ca3e..e5c1aca 100644
--- a/Allura/allura/tests/model/test_notification.py
+++ b/Allura/allura/tests/model/test_notification.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/model/test_project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_project.py b/Allura/allura/tests/model/test_project.py
index d8a754f..9e8356c 100644
--- a/Allura/allura/tests/model/test_project.py
+++ b/Allura/allura/tests/model/test_project.py
@@ -20,6 +20,10 @@
"""
Model tests for project
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from nose import with_setup
from nose.tools import assert_equals, assert_in
from pylons import tmpl_context as c
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/model/test_repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_repo.py b/Allura/allura/tests/model/test_repo.py
index f71ad71..8920f32 100644
--- a/Allura/allura/tests/model/test_repo.py
+++ b/Allura/allura/tests/model/test_repo.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/templates/jinja_master/test_lib.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/templates/jinja_master/test_lib.py b/Allura/allura/tests/templates/jinja_master/test_lib.py
index 4979b99..10701d0 100644
--- a/Allura/allura/tests/templates/jinja_master/test_lib.py
+++ b/Allura/allura/tests/templates/jinja_master/test_lib.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
[14/14] allura git commit: [#7878] ticket:771 Fix headers in
middleware
Posted by je...@apache.org.
[#7878] ticket:771 Fix headers in middleware
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/bffdd182
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/bffdd182
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/bffdd182
Branch: refs/heads/ib/7878
Commit: bffdd182bbcf58bbf262fdd12327844061777fad
Parents: 318560e
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed May 20 11:12:16 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed May 20 11:12:16 2015 +0000
----------------------------------------------------------------------
Allura/allura/lib/custom_middleware.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/bffdd182/Allura/allura/lib/custom_middleware.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/custom_middleware.py b/Allura/allura/lib/custom_middleware.py
index 14e0ebd..58a240b 100644
--- a/Allura/allura/lib/custom_middleware.py
+++ b/Allura/allura/lib/custom_middleware.py
@@ -59,7 +59,7 @@ class StaticFilesMiddleware(object):
for ep in tool_entry_points]
def __call__(self, environ, start_response):
- environ['static.script_name'] = self.script_name
+ environ[b'static.script_name'] = self.script_name
if not environ['PATH_INFO'].startswith(self.script_name):
return self.app(environ, start_response)
try:
@@ -79,14 +79,14 @@ class StaticFilesMiddleware(object):
file_path = pkg_resources.resource_filename(
resource_cls.__module__, resource_path)
return fileapp.FileApp(file_path, [
- ('Access-Control-Allow-Origin', '*')])
+ (b'Access-Control-Allow-Origin', '*')])
filename = environ['PATH_INFO'][len(self.script_name):]
file_path = pkg_resources.resource_filename(
'allura', os.path.join(
'public', 'nf',
filename))
return fileapp.FileApp(file_path, [
- ('Access-Control-Allow-Origin', '*')])
+ (b'Access-Control-Allow-Origin', '*')])
class LoginRedirectMiddleware(object):
@@ -145,7 +145,7 @@ class CSRFMiddleware(object):
def session_start_response(status, headers, exc_info=None):
if dict(headers).get('Content-Type', '').startswith('text/html'):
headers.append(
- ('Set-cookie',
+ (b'Set-cookie',
str('%s=%s; Path=/' % (self._cookie_name, cookie))))
return start_response(status, headers, exc_info)
return self._app(environ, session_start_response)
@@ -318,7 +318,7 @@ class RememberLoginMiddleware(object):
header, contents = headers[i]
if header == 'Set-cookie' and \
contents.lstrip().startswith(session.key):
- headers[i] = ('Set-cookie', cookie)
+ headers[i] = (b'Set-cookie', str(cookie))
break
return start_response(status, headers, exc_info)
[04/14] allura git commit: [#7878] ticket:771 Add __future__ imports
Posted by je...@apache.org.
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_app.py b/Allura/allura/tests/test_app.py
index a31f112..0953066 100644
--- a/Allura/allura/tests/test_app.py
+++ b/Allura/allura/tests/test_app.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_commands.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_commands.py b/Allura/allura/tests/test_commands.py
index f6800b7..74011c0 100644
--- a/Allura/allura/tests/test_commands.py
+++ b/Allura/allura/tests/test_commands.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_decorators.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_decorators.py b/Allura/allura/tests/test_decorators.py
index 0d1d338..ff1775b 100644
--- a/Allura/allura/tests/test_decorators.py
+++ b/Allura/allura/tests/test_decorators.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_diff.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_diff.py b/Allura/allura/tests/test_diff.py
index 67c0807..7f4a3c9 100644
--- a/Allura/allura/tests/test_diff.py
+++ b/Allura/allura/tests/test_diff.py
@@ -16,6 +16,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import unittest
from allura.lib.diff import HtmlSideBySideDiff
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_dispatch.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_dispatch.py b/Allura/allura/tests/test_dispatch.py
index 19f9652..882e559 100644
--- a/Allura/allura/tests/test_dispatch.py
+++ b/Allura/allura/tests/test_dispatch.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index ca04652..e249d04 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -18,6 +18,10 @@
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import re
import os
import allura
@@ -789,8 +793,8 @@ class TestNeighborhoodCache(object):
@patch('allura.lib.app_globals.datetime', autospec=True)
def test_lookup(self, dt_mock, M):
dt_mock.datetime.utcnow.side_effect = [
- dt.datetime(2015, 02, 05, 11, 32),
- dt.datetime(2015, 02, 05, 11, 34),
+ dt.datetime(2015, 0o2, 0o5, 11, 32),
+ dt.datetime(2015, 0o2, 0o5, 11, 34),
]
ret = M.Neighborhood.query.get.return_value
cache = NeighborhoodCache(30)
@@ -801,7 +805,7 @@ class TestNeighborhoodCache(object):
assert_equal(n, ret)
assert_equal(cache._data, {'/p/': {
'object': ret,
- 'ts': dt.datetime(2015, 02, 05, 11, 32),
+ 'ts': dt.datetime(2015, 0o2, 0o5, 11, 32),
}})
# hits mongo every time
@@ -810,15 +814,15 @@ class TestNeighborhoodCache(object):
assert_equal(n, ret)
assert_equal(cache._data, {'/p/': {
'object': ret,
- 'ts': dt.datetime(2015, 02, 05, 11, 34),
+ 'ts': dt.datetime(2015, 0o2, 0o5, 11, 34),
}})
@patch('allura.lib.app_globals.M', autospec=True)
@patch('allura.lib.app_globals.datetime', autospec=True)
def test_get(self, dt_mock, M):
dt_mock.datetime.utcnow.side_effect = [
- dt.datetime(2015, 02, 05, 11, 32),
- dt.datetime(2015, 02, 05, 11, 34),
+ dt.datetime(2015, 0o2, 0o5, 11, 32),
+ dt.datetime(2015, 0o2, 0o5, 11, 34),
]
ret = M.Neighborhood.query.get.return_value
cache = NeighborhoodCache(30)
@@ -842,7 +846,7 @@ class TestNeighborhoodCache(object):
@patch('allura.lib.app_globals.datetime', autospec=True)
def test_expired(self, dt_mock):
dt_mock.timedelta = dt.timedelta # restore original
- _now = dt.datetime(2015, 02, 05, 11, 53)
+ _now = dt.datetime(2015, 0o2, 0o5, 11, 53)
dt_mock.datetime.utcnow.return_value = _now
cache = NeighborhoodCache(0)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py
index 49032eb..fa7fa78 100644
--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from unittest import TestCase
from os import path
from datetime import datetime, timedelta
@@ -112,14 +116,14 @@ def test_find_project():
def test_make_users():
- r = h.make_users([None]).next()
+ r = next(h.make_users([None]))
assert r.username == '*anonymous', r
def test_make_roles():
h.set_context('test', 'wiki', neighborhood='Projects')
pr = M.ProjectRole.anonymous()
- assert h.make_roles([pr._id]).next() == pr
+ assert next(h.make_roles([pr._id])) == pr
@td.with_wiki
@@ -312,7 +316,7 @@ def test_inject_user(context):
def test_datetimeformat():
from datetime import date
- assert h.datetimeformat(date(2013, 01, 01)) == '2013-01-01 00:00:00'
+ assert h.datetimeformat(date(2013, 0o1, 0o1)) == '2013-01-01 00:00:00'
def test_nl2br_jinja_filter():
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_mail_util.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_mail_util.py b/Allura/allura/tests/test_mail_util.py
index e8d5e12..ebeadf8 100644
--- a/Allura/allura/tests/test_mail_util.py
+++ b/Allura/allura/tests/test_mail_util.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import unittest
from email.MIMEMultipart import MIMEMultipart
from email.MIMEText import MIMEText
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_markdown.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_markdown.py b/Allura/allura/tests/test_markdown.py
index 3ff53b4..3a519f1 100644
--- a/Allura/allura/tests/test_markdown.py
+++ b/Allura/allura/tests/test_markdown.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import unittest
import mock
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_plugin.py b/Allura/allura/tests/test_plugin.py
index 08bdc6c..3a63bd9 100644
--- a/Allura/allura/tests/test_plugin.py
+++ b/Allura/allura/tests/test_plugin.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -250,7 +254,7 @@ class TestLocalAuthenticationProvider(object):
def test_get_last_password_updated(self):
user = Mock()
- user.last_password_updated = dt.datetime(2014, 06, 04, 13, 13, 13)
+ user.last_password_updated = dt.datetime(2014, 0o6, 0o4, 13, 13, 13)
upd = self.provider.get_last_password_updated(user)
assert_equal(upd, user.last_password_updated)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_scripttask.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_scripttask.py b/Allura/allura/tests/test_scripttask.py
index 6273ee0..19fcd4b 100644
--- a/Allura/allura/tests/test_scripttask.py
+++ b/Allura/allura/tests/test_scripttask.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_security.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_security.py b/Allura/allura/tests/test_security.py
index 44b2831..119bd86 100644
--- a/Allura/allura/tests/test_security.py
+++ b/Allura/allura/tests/test_security.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_tasks.py b/Allura/allura/tests/test_tasks.py
index 9cd7d26..148713b 100644
--- a/Allura/allura/tests/test_tasks.py
+++ b/Allura/allura/tests/test_tasks.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import operator
import shutil
import sys
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_utils.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_utils.py b/Allura/allura/tests/test_utils.py
index 7903ba3..8d7693e 100644
--- a/Allura/allura/tests/test_utils.py
+++ b/Allura/allura/tests/test_utils.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import json
import time
import unittest
@@ -301,6 +305,6 @@ def test_empty_cursor():
def test_DateJSONEncoder():
data = {'message': u'Hi!',
- 'date': dt.datetime(2015, 01, 30, 13, 13, 13)}
+ 'date': dt.datetime(2015, 0o1, 30, 13, 13, 13)}
result = json.dumps(data, cls=utils.DateJSONEncoder)
assert_equal(result, '{"date": "2015-01-30T13:13:13Z", "message": "Hi!"}')
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_validators.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_validators.py b/Allura/allura/tests/test_validators.py
index f50b8f7..d0cbfe7 100644
--- a/Allura/allura/tests/test_validators.py
+++ b/Allura/allura/tests/test_validators.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_webhooks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_webhooks.py b/Allura/allura/tests/test_webhooks.py
index d7fb75c..36a7bbb 100644
--- a/Allura/allura/tests/test_webhooks.py
+++ b/Allura/allura/tests/test_webhooks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -638,7 +642,7 @@ class TestModels(TestWebhookBase):
@patch('allura.model.webhook.dt', autospec=True)
def test_update_limit(self, dt_mock):
- _now = dt.datetime(2015, 02, 02, 13, 39)
+ _now = dt.datetime(2015, 0o2, 0o2, 13, 39)
dt_mock.datetime.utcnow.return_value = _now
assert_equal(self.wh.last_sent, None)
self.wh.update_limit()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/test_zarkov_helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_zarkov_helpers.py b/Allura/allura/tests/test_zarkov_helpers.py
index 2a6cb38..816025f 100644
--- a/Allura/allura/tests/test_zarkov_helpers.py
+++ b/Allura/allura/tests/test_zarkov_helpers.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import unittest
from calendar import timegm
from datetime import datetime
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/tscript.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/tscript.py b/Allura/allura/tests/tscript.py
index 6691331..027f3ce 100644
--- a/Allura/allura/tests/tscript.py
+++ b/Allura/allura/tests/tscript.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -21,7 +25,7 @@ from allura import model as M
log = logging.getLogger(__name__)
-print 'In a script'
+print('In a script')
log.info('in a script')
for p in M.Project.query.find():
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/tscript_error.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/tscript_error.py b/Allura/allura/tests/tscript_error.py
index ddba357..9dfa152 100644
--- a/Allura/allura/tests/tscript_error.py
+++ b/Allura/allura/tests/tscript_error.py
@@ -16,4 +16,8 @@
# under the License.
'''Script that raises ValueError'''
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
raise ValueError
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/__init__.py b/Allura/allura/tests/unit/__init__.py
index 27eb1e5..b27c0b9 100644
--- a/Allura/allura/tests/unit/__init__.py
+++ b/Allura/allura/tests/unit/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/controllers/test_auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/controllers/test_auth.py b/Allura/allura/tests/unit/controllers/test_auth.py
index 8fb8e46..584e04c 100644
--- a/Allura/allura/tests/unit/controllers/test_auth.py
+++ b/Allura/allura/tests/unit/controllers/test_auth.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py b/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
index e6dc38d..2fc3f6a 100644
--- a/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
+++ b/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/controllers/test_dispatch_index.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/controllers/test_dispatch_index.py b/Allura/allura/tests/unit/controllers/test_dispatch_index.py
index 20f3eb8..9b48ca0 100644
--- a/Allura/allura/tests/unit/controllers/test_dispatch_index.py
+++ b/Allura/allura/tests/unit/controllers/test_dispatch_index.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/factories.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/factories.py b/Allura/allura/tests/unit/factories.py
index 6acb54f..ad2480b 100644
--- a/Allura/allura/tests/unit/factories.py
+++ b/Allura/allura/tests/unit/factories.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/patches.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/patches.py b/Allura/allura/tests/unit/patches.py
index 41cb403..520ffbb 100644
--- a/Allura/allura/tests/unit/patches.py
+++ b/Allura/allura/tests/unit/patches.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/spam/test_akismet.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/spam/test_akismet.py b/Allura/allura/tests/unit/spam/test_akismet.py
index 79802c3..8ad4f83 100644
--- a/Allura/allura/tests/unit/spam/test_akismet.py
+++ b/Allura/allura/tests/unit/spam/test_akismet.py
@@ -18,6 +18,10 @@
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import mock
import unittest
import urllib
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/spam/test_mollom.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/spam/test_mollom.py b/Allura/allura/tests/unit/spam/test_mollom.py
index cac2ab8..eca9508 100644
--- a/Allura/allura/tests/unit/spam/test_mollom.py
+++ b/Allura/allura/tests/unit/spam/test_mollom.py
@@ -18,6 +18,10 @@
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import mock
import unittest
import urllib
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/spam/test_spam_filter.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/spam/test_spam_filter.py b/Allura/allura/tests/unit/spam/test_spam_filter.py
index 1d96c7f..54d508c 100644
--- a/Allura/allura/tests/unit/spam/test_spam_filter.py
+++ b/Allura/allura/tests/unit/spam/test_spam_filter.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import mock
import unittest
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_app.py b/Allura/allura/tests/unit/test_app.py
index eca1ae7..525f84d 100644
--- a/Allura/allura/tests/unit/test_app.py
+++ b/Allura/allura/tests/unit/test_app.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_artifact.py b/Allura/allura/tests/unit/test_artifact.py
index 895eb74..d030fed 100644
--- a/Allura/allura/tests/unit/test_artifact.py
+++ b/Allura/allura/tests/unit/test_artifact.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_discuss.py b/Allura/allura/tests/unit/test_discuss.py
index 07c9525..4370f09 100644
--- a/Allura/allura/tests/unit/test_discuss.py
+++ b/Allura/allura/tests/unit/test_discuss.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_helpers/test_ago.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_helpers/test_ago.py b/Allura/allura/tests/unit/test_helpers/test_ago.py
index 5e09a2c..ba1af6d 100644
--- a/Allura/allura/tests/unit/test_helpers/test_ago.py
+++ b/Allura/allura/tests/unit/test_helpers/test_ago.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_helpers/test_set_context.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_helpers/test_set_context.py b/Allura/allura/tests/unit/test_helpers/test_set_context.py
index 8b56a0f..1ec6756 100644
--- a/Allura/allura/tests/unit/test_helpers/test_set_context.py
+++ b/Allura/allura/tests/unit/test_helpers/test_set_context.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_ldap_auth_provider.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_ldap_auth_provider.py b/Allura/allura/tests/unit/test_ldap_auth_provider.py
index abce671..05f3612 100644
--- a/Allura/allura/tests/unit/test_ldap_auth_provider.py
+++ b/Allura/allura/tests/unit/test_ldap_auth_provider.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import calendar
from datetime import datetime, timedelta
from bson import ObjectId
@@ -147,6 +151,6 @@ class TestLdapAuthenticationProvider(object):
def test_get_last_password_updated(self):
user = Mock()
- user.last_password_updated = datetime(2014, 06, 04, 13, 13, 13)
+ user.last_password_updated = datetime(2014, 0o6, 0o4, 13, 13, 13)
upd = self.provider.get_last_password_updated(user)
assert_equal(upd, user.last_password_updated)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_mixins.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_mixins.py b/Allura/allura/tests/unit/test_mixins.py
index cdc3aaa..6000654 100644
--- a/Allura/allura/tests/unit/test_mixins.py
+++ b/Allura/allura/tests/unit/test_mixins.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_package_path_loader.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_package_path_loader.py b/Allura/allura/tests/unit/test_package_path_loader.py
index c3109c3..8ebad7b 100644
--- a/Allura/allura/tests/unit/test_package_path_loader.py
+++ b/Allura/allura/tests/unit/test_package_path_loader.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_post_model.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_post_model.py b/Allura/allura/tests/unit/test_post_model.py
index ed33ecb..b0d8de9 100644
--- a/Allura/allura/tests/unit/test_post_model.py
+++ b/Allura/allura/tests/unit/test_post_model.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_project.py b/Allura/allura/tests/unit/test_project.py
index 28ba7fa..aa1be14 100644
--- a/Allura/allura/tests/unit/test_project.py
+++ b/Allura/allura/tests/unit/test_project.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_repo.py b/Allura/allura/tests/unit/test_repo.py
index 9008571..2197586 100644
--- a/Allura/allura/tests/unit/test_repo.py
+++ b/Allura/allura/tests/unit/test_repo.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_session.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_session.py b/Allura/allura/tests/unit/test_session.py
index dc9711d..11c6c8c 100644
--- a/Allura/allura/tests/unit/test_session.py
+++ b/Allura/allura/tests/unit/test_session.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_sitemapentry.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_sitemapentry.py b/Allura/allura/tests/unit/test_sitemapentry.py
index bdd6399..2a6353c 100644
--- a/Allura/allura/tests/unit/test_sitemapentry.py
+++ b/Allura/allura/tests/unit/test_sitemapentry.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/tests/unit/test_solr.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_solr.py b/Allura/allura/tests/unit/test_solr.py
index 3d5317c..1b5d899 100644
--- a/Allura/allura/tests/unit/test_solr.py
+++ b/Allura/allura/tests/unit/test_solr.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/version.py
----------------------------------------------------------------------
diff --git a/Allura/allura/version.py b/Allura/allura/version.py
index e880449..50896f8 100644
--- a/Allura/allura/version.py
+++ b/Allura/allura/version.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/webhooks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/webhooks.py b/Allura/allura/webhooks.py
index c42be86..7d4100c 100644
--- a/Allura/allura/webhooks.py
+++ b/Allura/allura/webhooks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/websetup/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/websetup/__init__.py b/Allura/allura/websetup/__init__.py
index 37b1586..339ef36 100644
--- a/Allura/allura/websetup/__init__.py
+++ b/Allura/allura/websetup/__init__.py
@@ -18,6 +18,10 @@
# under the License.
"""Setup the allura application"""
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
import logging
@@ -27,8 +31,8 @@ __all__ = ['setup_app']
log = logging.getLogger(__name__)
-from schema import setup_schema
-import bootstrap
+from .schema import setup_schema
+from . import bootstrap
def setup_app(command, conf, vars):
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/websetup/bootstrap.py
----------------------------------------------------------------------
diff --git a/Allura/allura/websetup/bootstrap.py b/Allura/allura/websetup/bootstrap.py
index ed76c15..7aa1a4c 100644
--- a/Allura/allura/websetup/bootstrap.py
+++ b/Allura/allura/websetup/bootstrap.py
@@ -18,6 +18,10 @@
# under the License.
"""Setup the allura application"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import sys
import logging
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/websetup/schema.py
----------------------------------------------------------------------
diff --git a/Allura/allura/websetup/schema.py b/Allura/allura/websetup/schema.py
index d25128e..acf65d0 100644
--- a/Allura/allura/websetup/schema.py
+++ b/Allura/allura/websetup/schema.py
@@ -18,6 +18,10 @@
# under the License.
"""Setup the allura application"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/docs/conf.py
----------------------------------------------------------------------
diff --git a/Allura/docs/conf.py b/Allura/docs/conf.py
index c201b9c..e94d9c3 100644
--- a/Allura/docs/conf.py
+++ b/Allura/docs/conf.py
@@ -37,6 +37,10 @@
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/ez_setup/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/ez_setup/__init__.py b/Allura/ez_setup/__init__.py
index b8e23b3..6181956 100644
--- a/Allura/ez_setup/__init__.py
+++ b/Allura/ez_setup/__init__.py
@@ -31,6 +31,10 @@ the appropriate options to ``use_setuptools()``.
This file can also be run as a script to install or upgrade setuptools.
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import sys
DEFAULT_VERSION = "0.6c7"
DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
@@ -74,10 +78,10 @@ def _validate_md5(egg_name, data):
from md5 import md5
digest = md5(data).hexdigest()
if digest != md5_data[egg_name]:
- print >>sys.stderr, (
+ print((
"md5 validation of %s failed! (Possible download problem?)"
% egg_name
- )
+ ), file=sys.stderr)
sys.exit(2)
return data
@@ -100,10 +104,10 @@ def use_setuptools(
try:
import setuptools
if setuptools.__version__ == '0.0.1':
- print >>sys.stderr, (
+ print((
"You have an obsolete version of setuptools installed. Please\n"
"remove it from your system entirely before rerunning this script."
- )
+ ), file=sys.stderr)
sys.exit(2)
except ImportError:
egg = download_setuptools(
@@ -116,13 +120,13 @@ def use_setuptools(
try:
pkg_resources.require("setuptools>=" + version)
- except pkg_resources.VersionConflict, e:
+ except pkg_resources.VersionConflict as e:
# XXX could we install in a subprocess here?
- print >>sys.stderr, (
+ print((
"The required version of setuptools (>=%s) is not available, and\n"
"can't be installed while this script is running. Please install\n"
" a more recent version first.\n\n(Currently using %r)"
- ) % (version, e.args[0])
+ ) % (version, e.args[0]), file=sys.stderr)
sys.exit(2)
@@ -216,8 +220,8 @@ def main(argv, version=DEFAULT_VERSION):
from setuptools.command.easy_install import main
main(argv)
else:
- print "Setuptools version", version, "or greater has been installed."
- print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
+ print("Setuptools version", version, "or greater has been installed.")
+ print('(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)')
def update_md5(filenames):
@@ -244,7 +248,7 @@ def update_md5(filenames):
match = re.search("\nmd5_data = {\n([^}]+)}", src)
if not match:
- print >>sys.stderr, "Internal error!"
+ print("Internal error!", file=sys.stderr)
sys.exit(2)
src = src[:match.start(1)] + repl + src[match.end(1):]
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/ldap-setup.py
----------------------------------------------------------------------
diff --git a/Allura/ldap-setup.py b/Allura/ldap-setup.py
index 4f58342..f368509 100644
--- a/Allura/ldap-setup.py
+++ b/Allura/ldap-setup.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import shutil
import string
@@ -53,7 +57,7 @@ def main():
run('ldapadd -Y EXTERNAL -H ldapi:/// -f %s' % name)
with open('/etc/ldap.secret', 'w') as fp:
fp.write(secret)
- os.chmod('/etc/ldap.secret', 0400)
+ os.chmod('/etc/ldap.secret', 0o400)
if get_value('add frontend ldif', 'y') == 'y':
with tempfile(frontend_ldif, locals()) as name:
run('ldapadd -c -x -D cn=admin,%s -W -f %s -y /etc/ldap.secret' %
@@ -74,7 +78,7 @@ def main():
log.info('writing passwd')
with open('/etc/ldapscripts/ldapscripts.passwd', 'w') as fp:
fp.write(secret)
- os.chmod('/etc/ldapscripts/ldapscripts.passwd', 0400)
+ os.chmod('/etc/ldapscripts/ldapscripts.passwd', 0o400)
log.info('writing runtime')
with open('/usr/share/ldapscripts/runtime.debian', 'w') as fp:
fp.write(ldapscripts_debian)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/ldap-userconfig.py
----------------------------------------------------------------------
diff --git a/Allura/ldap-userconfig.py b/Allura/ldap-userconfig.py
index bc36c1f..edf7446 100644
--- a/Allura/ldap-userconfig.py
+++ b/Allura/ldap-userconfig.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import sys
import pwd
@@ -36,8 +40,8 @@ def init(uname):
os.mkdir(ssh)
u = pwd.getpwnam(uname)
g = grp.getgrnam('scm')
- os.chmod(home, 0700)
- os.chmod(ssh, 0700)
+ os.chmod(home, 0o700)
+ os.chmod(ssh, 0o700)
os.chown(home, u.pw_uid, g.gr_gid)
os.chown(ssh, u.pw_uid, g.gr_gid)
@@ -49,7 +53,7 @@ def upload(uname, pubkey):
with open(keyfile, 'w') as fp:
fp.write(pubkey)
os.chown(keyfile, u.pw_uid, g.gr_gid)
- os.chmod(keyfile, 0600)
+ os.chmod(keyfile, 0o600)
if __name__ == '__main__':
main()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/setup.py
----------------------------------------------------------------------
diff --git a/Allura/setup.py b/Allura/setup.py
index 05cbf0b..8e0981b 100644
--- a/Allura/setup.py
+++ b/Allura/setup.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
try:
from setuptools import setup, find_packages
except ImportError:
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/test-light.py
----------------------------------------------------------------------
diff --git a/Allura/test-light.py b/Allura/test-light.py
index f095214..b2edc2b 100644
--- a/Allura/test-light.py
+++ b/Allura/test-light.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/AlluraTest/alluratest/controller.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/controller.py b/AlluraTest/alluratest/controller.py
index 4a8f983..e363147 100644
--- a/AlluraTest/alluratest/controller.py
+++ b/AlluraTest/alluratest/controller.py
@@ -16,6 +16,10 @@
# under the License.
"""Unit and functional test suite for allura."""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import urllib
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/AlluraTest/alluratest/test_syntax.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/test_syntax.py b/AlluraTest/alluratest/test_syntax.py
index b30a6b8..08fa0a7 100644
--- a/AlluraTest/alluratest/test_syntax.py
+++ b/AlluraTest/alluratest/test_syntax.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -67,9 +71,9 @@ def test_pyflakes():
# print 'Command was: %s' % cmd
retval = run(cmd)
if retval != 1:
- print
+ print()
# print 'Command was: %s' % cmd
- print 'Returned %s' % retval
+ print('Returned %s' % retval)
error = True
if error:
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/AlluraTest/alluratest/validation.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/validation.py b/AlluraTest/alluratest/validation.py
index 97691df..bd55608 100644
--- a/AlluraTest/alluratest/validation.py
+++ b/AlluraTest/alluratest/validation.py
@@ -20,6 +20,10 @@
"""
Functions to syntax-validate output content
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from os import path
import os
import sys
@@ -126,7 +130,7 @@ def validate_json(json_or_response):
try:
obj = json.loads(j)
- except Exception, e:
+ except Exception as e:
ok_(False, "Couldn't validate JSON: " + str(e) + ':' + j[:100] + '...')
return obj
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/AlluraTest/setup.py
----------------------------------------------------------------------
diff --git a/AlluraTest/setup.py b/AlluraTest/setup.py
index 5a03015..187f12a 100644
--- a/AlluraTest/setup.py
+++ b/AlluraTest/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeActivity/forgeactivity/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/__init__.py b/ForgeActivity/forgeactivity/__init__.py
index d994a08..a3be1f0 100644
--- a/ForgeActivity/forgeactivity/__init__.py
+++ b/ForgeActivity/forgeactivity/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,4 +19,4 @@
# specific language governing permissions and limitations
# under the License.
-from main import ForgeActivityApp
+from .main import ForgeActivityApp
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeActivity/forgeactivity/config/resources.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/config/resources.py b/ForgeActivity/forgeactivity/config/resources.py
index 5d98bd3..ebcdd35 100644
--- a/ForgeActivity/forgeactivity/config/resources.py
+++ b/ForgeActivity/forgeactivity/config/resources.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index e0b22c8..2f10609 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeActivity/forgeactivity/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/tests/functional/test_root.py b/ForgeActivity/forgeactivity/tests/functional/test_root.py
index 240ed7d..7f2ebbf 100644
--- a/ForgeActivity/forgeactivity/tests/functional/test_root.py
+++ b/ForgeActivity/forgeactivity/tests/functional/test_root.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeActivity/forgeactivity/widgets/follow.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/widgets/follow.py b/ForgeActivity/forgeactivity/widgets/follow.py
index 1aed295..910a7cb 100644
--- a/ForgeActivity/forgeactivity/widgets/follow.py
+++ b/ForgeActivity/forgeactivity/widgets/follow.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeActivity/setup.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/setup.py b/ForgeActivity/setup.py
index 9795dfb..43b46ba 100644
--- a/ForgeActivity/setup.py
+++ b/ForgeActivity/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/command/base.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/command/base.py b/ForgeBlog/forgeblog/command/base.py
index 8e67cc9..75f3d46 100644
--- a/ForgeBlog/forgeblog/command/base.py
+++ b/ForgeBlog/forgeblog/command/base.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/command/rssfeeds.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/command/rssfeeds.py b/ForgeBlog/forgeblog/command/rssfeeds.py
index 7771a5c..a09637d 100644
--- a/ForgeBlog/forgeblog/command/rssfeeds.py
+++ b/ForgeBlog/forgeblog/command/rssfeeds.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -21,7 +25,7 @@ from datetime import datetime
import feedparser
from bson import ObjectId
-import base
+from . import base
from allura.command import base as allura_base
from ming.orm import session
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/main.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py
index b4dcd4a..27cb338 100644
--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/model/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/__init__.py b/ForgeBlog/forgeblog/model/__init__.py
index 7c17d5c..6054730 100644
--- a/ForgeBlog/forgeblog/model/__init__.py
+++ b/ForgeBlog/forgeblog/model/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,4 +19,4 @@
# specific language governing permissions and limitations
# under the License.
-from blog import Globals, BlogPost, Attachment, BlogPostSnapshot
+from .blog import Globals, BlogPost, Attachment, BlogPostSnapshot
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/model/blog.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index c8426cb..7dc68e6 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/functional/test_rest.py b/ForgeBlog/forgeblog/tests/functional/test_rest.py
index 05e06c8..46c06b8 100644
--- a/ForgeBlog/forgeblog/tests/functional/test_rest.py
+++ b/ForgeBlog/forgeblog/tests/functional/test_rest.py
@@ -16,6 +16,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from datetime import date
from nose.tools import assert_equal
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/functional/test_root.py b/ForgeBlog/forgeblog/tests/functional/test_root.py
index 6bc530e..e482757 100644
--- a/ForgeBlog/forgeblog/tests/functional/test_root.py
+++ b/ForgeBlog/forgeblog/tests/functional/test_root.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/tests/test_app.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/test_app.py b/ForgeBlog/forgeblog/tests/test_app.py
index bab8f22..dd6cb01 100644
--- a/ForgeBlog/forgeblog/tests/test_app.py
+++ b/ForgeBlog/forgeblog/tests/test_app.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/tests/test_commands.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/test_commands.py b/ForgeBlog/forgeblog/tests/test_commands.py
index 7f2d0f7..88e6eef 100644
--- a/ForgeBlog/forgeblog/tests/test_commands.py
+++ b/ForgeBlog/forgeblog/tests/test_commands.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/tests/test_roles.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/test_roles.py b/ForgeBlog/forgeblog/tests/test_roles.py
index e270bec..69fce17 100644
--- a/ForgeBlog/forgeblog/tests/test_roles.py
+++ b/ForgeBlog/forgeblog/tests/test_roles.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/tests/unit/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/unit/__init__.py b/ForgeBlog/forgeblog/tests/unit/__init__.py
index dbef2b5..68f82e7 100644
--- a/ForgeBlog/forgeblog/tests/unit/__init__.py
+++ b/ForgeBlog/forgeblog/tests/unit/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/tests/unit/test_blog_post.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/unit/test_blog_post.py b/ForgeBlog/forgeblog/tests/unit/test_blog_post.py
index 34842c5..b08bab3 100644
--- a/ForgeBlog/forgeblog/tests/unit/test_blog_post.py
+++ b/ForgeBlog/forgeblog/tests/unit/test_blog_post.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/version.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/version.py b/ForgeBlog/forgeblog/version.py
index 1b493f8..8f5910c 100644
--- a/ForgeBlog/forgeblog/version.py
+++ b/ForgeBlog/forgeblog/version.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/forgeblog/widgets.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/widgets.py b/ForgeBlog/forgeblog/widgets.py
index 9d54903..cb719a4 100644
--- a/ForgeBlog/forgeblog/widgets.py
+++ b/ForgeBlog/forgeblog/widgets.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeBlog/setup.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/setup.py b/ForgeBlog/setup.py
index 7eda917..4be3a9e 100644
--- a/ForgeBlog/setup.py
+++ b/ForgeBlog/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeChat/forgechat/command.py
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/command.py b/ForgeChat/forgechat/command.py
index 6af2eaa..1f2d2a3 100644
--- a/ForgeChat/forgechat/command.py
+++ b/ForgeChat/forgechat/command.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeChat/forgechat/main.py
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/main.py b/ForgeChat/forgechat/main.py
index 39a6807..336b0db 100644
--- a/ForgeChat/forgechat/main.py
+++ b/ForgeChat/forgechat/main.py
@@ -17,6 +17,10 @@
'''IRC Chatbot Plugin
'''
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
#-*- python -*-
import logging
from datetime import date, time, datetime, timedelta
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeChat/forgechat/model/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/model/__init__.py b/ForgeChat/forgechat/model/__init__.py
index cf46080..91b6467 100644
--- a/ForgeChat/forgechat/model/__init__.py
+++ b/ForgeChat/forgechat/model/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,4 +19,4 @@
# specific language governing permissions and limitations
# under the License.
-from chat import ChatChannel, ChatMessage
+from .chat import ChatChannel, ChatMessage
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeChat/forgechat/model/chat.py
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/model/chat.py b/ForgeChat/forgechat/model/chat.py
index 3907101..03466b5 100644
--- a/ForgeChat/forgechat/model/chat.py
+++ b/ForgeChat/forgechat/model/chat.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeChat/forgechat/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/tests/functional/test_root.py b/ForgeChat/forgechat/tests/functional/test_root.py
index 013176c..41860da 100644
--- a/ForgeChat/forgechat/tests/functional/test_root.py
+++ b/ForgeChat/forgechat/tests/functional/test_root.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeChat/forgechat/version.py
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/version.py b/ForgeChat/forgechat/version.py
index 1b493f8..8f5910c 100644
--- a/ForgeChat/forgechat/version.py
+++ b/ForgeChat/forgechat/version.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeChat/setup.py
----------------------------------------------------------------------
diff --git a/ForgeChat/setup.py b/ForgeChat/setup.py
index 242841b..a613415 100644
--- a/ForgeChat/setup.py
+++ b/ForgeChat/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/controllers/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/__init__.py b/ForgeDiscussion/forgediscussion/controllers/__init__.py
index e146302..05520b5 100644
--- a/ForgeDiscussion/forgediscussion/controllers/__init__.py
+++ b/ForgeDiscussion/forgediscussion/controllers/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,4 +19,4 @@
# specific language governing permissions and limitations
# under the License.
-from root import RootController, RootRestController
+from .root import RootController, RootRestController
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/controllers/forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/forum.py b/ForgeDiscussion/forgediscussion/controllers/forum.py
index 67dbea3..7add8b1 100644
--- a/ForgeDiscussion/forgediscussion/controllers/forum.py
+++ b/ForgeDiscussion/forgediscussion/controllers/forum.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/controllers/root.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/root.py b/ForgeDiscussion/forgediscussion/controllers/root.py
index 7548cd0..567f3bf 100644
--- a/ForgeDiscussion/forgediscussion/controllers/root.py
+++ b/ForgeDiscussion/forgediscussion/controllers/root.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -339,7 +343,7 @@ class RootRestController(BaseController):
warnings, doc = import_support.validate_import(
doc, username_mapping)
return dict(warnings=warnings, errors=[])
- except Exception, e:
+ except Exception as e:
raise
log.exception(e)
return dict(status=False, errors=[repr(e)])
@@ -360,7 +364,7 @@ class RootRestController(BaseController):
warnings = import_support.perform_import(
doc, username_mapping, default_username, create_users)
return dict(warnings=warnings, errors=[])
- except Exception, e:
+ except Exception as e:
raise
log.exception(e)
return dict(status=False, errors=[str(e)])
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/forum_main.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/forum_main.py b/ForgeDiscussion/forgediscussion/forum_main.py
index e66ec43..923fa0a 100644
--- a/ForgeDiscussion/forgediscussion/forum_main.py
+++ b/ForgeDiscussion/forgediscussion/forum_main.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -41,7 +45,7 @@ from forgediscussion import utils
from forgediscussion import version
from .controllers import RootController, RootRestController
-from widgets.admin import OptionsAdmin, AddForum
+from .widgets.admin import OptionsAdmin, AddForum
log = logging.getLogger(__name__)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/import_support.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/import_support.py b/ForgeDiscussion/forgediscussion/import_support.py
index 5318ec5..0e578b5 100644
--- a/ForgeDiscussion/forgediscussion/import_support.py
+++ b/ForgeDiscussion/forgediscussion/import_support.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/model/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/model/__init__.py b/ForgeDiscussion/forgediscussion/model/__init__.py
index 182bd94..5c28143 100644
--- a/ForgeDiscussion/forgediscussion/model/__init__.py
+++ b/ForgeDiscussion/forgediscussion/model/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,4 +19,4 @@
# specific language governing permissions and limitations
# under the License.
-from forum import Forum, ForumFile, ForumThread, ForumPost, ForumAttachment
+from .forum import Forum, ForumFile, ForumThread, ForumPost, ForumAttachment
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/model/forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/model/forum.py b/ForgeDiscussion/forgediscussion/model/forum.py
index 96e570d..e6bbd4e 100644
--- a/ForgeDiscussion/forgediscussion/model/forum.py
+++ b/ForgeDiscussion/forgediscussion/model/forum.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/site_stats.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/site_stats.py b/ForgeDiscussion/forgediscussion/site_stats.py
index 6918137..2ee3f7e 100644
--- a/ForgeDiscussion/forgediscussion/site_stats.py
+++ b/ForgeDiscussion/forgediscussion/site_stats.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/tasks.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tasks.py b/ForgeDiscussion/forgediscussion/tasks.py
index 9566818..ddf3bb4 100644
--- a/ForgeDiscussion/forgediscussion/tasks.py
+++ b/ForgeDiscussion/forgediscussion/tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
[06/14] allura git commit: [#7878] ticket:771 Add __future__ imports
Posted by je...@apache.org.
[#7878] ticket:771 Add __future__ imports
$ futurize --stage1 --all-imports --unicode-literals -w **/*.py
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/3640d5f6
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3640d5f6
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3640d5f6
Branch: refs/heads/ib/7878
Commit: 3640d5f6ca06c034b2415d0a20cb846f2bb4a5c7
Parents: 42d3a61
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue May 19 09:37:59 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue May 19 09:37:59 2015 +0000
----------------------------------------------------------------------
Allura/allura/__init__.py | 4 +
Allura/allura/app.py | 10 ++-
Allura/allura/command/__init__.py | 18 +++--
Allura/allura/command/base.py | 4 +
Allura/allura/command/create_neighborhood.py | 4 +
.../allura/command/create_trove_categories.py | 4 +
Allura/allura/command/reclone_repo.py | 4 +
Allura/allura/command/script.py | 10 ++-
.../allura/command/set_neighborhood_features.py | 4 +
Allura/allura/command/show_models.py | 10 ++-
Allura/allura/command/smtp_server.py | 4 +
Allura/allura/command/taskd.py | 8 +-
Allura/allura/command/taskd_cleanup.py | 6 +-
Allura/allura/config/app_cfg.py | 6 +-
Allura/allura/config/environment.py | 4 +
Allura/allura/config/middleware.py | 8 +-
Allura/allura/config/resources.py | 4 +
Allura/allura/controllers/__init__.py | 4 +
Allura/allura/controllers/attachments.py | 4 +
Allura/allura/controllers/auth.py | 6 +-
Allura/allura/controllers/base.py | 6 +-
.../allura/controllers/basetest_project_root.py | 10 ++-
Allura/allura/controllers/discuss.py | 6 +-
Allura/allura/controllers/error.py | 4 +
Allura/allura/controllers/feed.py | 4 +
Allura/allura/controllers/project.py | 12 ++-
Allura/allura/controllers/repository.py | 6 +-
Allura/allura/controllers/rest.py | 14 ++--
Allura/allura/controllers/root.py | 4 +
Allura/allura/controllers/search.py | 6 +-
Allura/allura/controllers/secure.py | 4 +
Allura/allura/controllers/site_admin.py | 6 +-
Allura/allura/controllers/static.py | 4 +
Allura/allura/controllers/task.py | 4 +
Allura/allura/controllers/template.py | 4 +
Allura/allura/controllers/trovecategories.py | 4 +
Allura/allura/eventslistener.py | 4 +
Allura/allura/ext/admin/__init__.py | 4 +
Allura/allura/ext/admin/admin_main.py | 14 ++--
Allura/allura/ext/admin/widgets.py | 4 +
Allura/allura/ext/project_home/__init__.py | 4 +
Allura/allura/ext/project_home/project_main.py | 4 +
Allura/allura/ext/search/__init__.py | 4 +
Allura/allura/ext/search/search_main.py | 4 +
Allura/allura/ext/user_profile/__init__.py | 4 +
Allura/allura/ext/user_profile/user_main.py | 4 +
Allura/allura/lib/AsciiDammit.py | 22 +++---
Allura/allura/lib/app_globals.py | 6 +-
Allura/allura/lib/base.py | 10 ++-
Allura/allura/lib/custom_middleware.py | 4 +
Allura/allura/lib/decorators.py | 6 +-
Allura/allura/lib/diff.py | 4 +
Allura/allura/lib/exceptions.py | 4 +
Allura/allura/lib/gravatar.py | 4 +
Allura/allura/lib/helpers.py | 4 +
Allura/allura/lib/import_api.py | 6 +-
Allura/allura/lib/macro.py | 6 +-
Allura/allura/lib/mail_util.py | 12 ++-
Allura/allura/lib/markdown_extensions.py | 4 +
Allura/allura/lib/package_path_loader.py | 4 +
Allura/allura/lib/patches.py | 6 +-
Allura/allura/lib/plugin.py | 4 +
Allura/allura/lib/repository.py | 6 +-
Allura/allura/lib/search.py | 4 +
Allura/allura/lib/security.py | 4 +
Allura/allura/lib/solr.py | 4 +
Allura/allura/lib/spam/__init__.py | 4 +
Allura/allura/lib/spam/akismetfilter.py | 4 +
Allura/allura/lib/spam/mollomfilter.py | 4 +
Allura/allura/lib/stats.py | 4 +
Allura/allura/lib/utils.py | 20 +++--
Allura/allura/lib/validators.py | 8 +-
Allura/allura/lib/widgets/__init__.py | 4 +
Allura/allura/lib/widgets/analytics.py | 4 +
Allura/allura/lib/widgets/auth_widgets.py | 4 +
Allura/allura/lib/widgets/discuss.py | 4 +
Allura/allura/lib/widgets/form_fields.py | 4 +
Allura/allura/lib/widgets/forms.py | 7 +-
Allura/allura/lib/widgets/macros.py | 4 +
Allura/allura/lib/widgets/oauth_widgets.py | 4 +
Allura/allura/lib/widgets/project_list.py | 4 +
Allura/allura/lib/widgets/repo.py | 4 +
Allura/allura/lib/widgets/search.py | 4 +
Allura/allura/lib/widgets/subscriptions.py | 4 +
Allura/allura/lib/widgets/user_profile.py | 4 +
Allura/allura/lib/widgets/vote.py | 4 +
Allura/allura/lib/zarkov_helpers.py | 4 +
Allura/allura/model/__init__.py | 4 +
Allura/allura/model/artifact.py | 14 ++--
Allura/allura/model/attachments.py | 4 +
Allura/allura/model/auth.py | 8 +-
Allura/allura/model/discuss.py | 4 +
Allura/allura/model/filesystem.py | 4 +
Allura/allura/model/index.py | 4 +
Allura/allura/model/monq_model.py | 8 +-
Allura/allura/model/neighborhood.py | 4 +
Allura/allura/model/notification.py | 4 +
Allura/allura/model/oauth.py | 4 +
Allura/allura/model/project.py | 12 ++-
Allura/allura/model/repo.py | 4 +
Allura/allura/model/repo_refresh.py | 8 +-
Allura/allura/model/repository.py | 10 ++-
Allura/allura/model/session.py | 4 +
Allura/allura/model/stats.py | 5 ++
Allura/allura/model/timeline.py | 4 +
Allura/allura/model/types.py | 4 +
Allura/allura/model/webhook.py | 4 +
Allura/allura/scripts/__init__.py | 6 +-
Allura/allura/scripts/refresh_last_commits.py | 12 ++-
Allura/allura/scripts/refreshrepo.py | 4 +
Allura/allura/scripts/reindex_projects.py | 6 +-
Allura/allura/scripts/reindex_users.py | 6 +-
.../allura/scripts/remove_duplicate_troves.py | 4 +
Allura/allura/scripts/scripttask.py | 4 +
Allura/allura/scripts/trac_export.py | 16 ++--
Allura/allura/scripts/trim_emails.py | 4 +
Allura/allura/scripts/update_checkout_url.py | 4 +
Allura/allura/tasks/activity_tasks.py | 4 +
Allura/allura/tasks/admin_tasks.py | 4 +
Allura/allura/tasks/event_tasks.py | 4 +
Allura/allura/tasks/export_tasks.py | 4 +
Allura/allura/tasks/index_tasks.py | 4 +
Allura/allura/tasks/mail_tasks.py | 6 +-
Allura/allura/tasks/notification_tasks.py | 4 +
Allura/allura/tasks/repo_tasks.py | 4 +
Allura/allura/templates/__init__.py | 4 +
Allura/allura/tests/__init__.py | 4 +
Allura/allura/tests/decorators.py | 4 +
Allura/allura/tests/functional/__init__.py | 4 +
Allura/allura/tests/functional/test_admin.py | 32 ++++----
Allura/allura/tests/functional/test_auth.py | 4 +
Allura/allura/tests/functional/test_discuss.py | 34 ++++----
Allura/allura/tests/functional/test_feeds.py | 4 +
Allura/allura/tests/functional/test_gravatar.py | 4 +
Allura/allura/tests/functional/test_home.py | 4 +
.../tests/functional/test_neighborhood.py | 4 +
Allura/allura/tests/functional/test_rest.py | 4 +
Allura/allura/tests/functional/test_root.py | 4 +
Allura/allura/tests/functional/test_search.py | 4 +
.../allura/tests/functional/test_site_admin.py | 6 +-
Allura/allura/tests/functional/test_static.py | 4 +
.../allura/tests/functional/test_subscriber.py | 4 +
.../allura/tests/functional/test_tool_list.py | 4 +
.../tests/functional/test_trovecategory.py | 4 +
.../tests/functional/test_user_profile.py | 4 +
Allura/allura/tests/model/__init__.py | 4 +
Allura/allura/tests/model/test_artifact.py | 4 +
Allura/allura/tests/model/test_auth.py | 4 +
Allura/allura/tests/model/test_discussion.py | 4 +
Allura/allura/tests/model/test_filesystem.py | 4 +
Allura/allura/tests/model/test_monq.py | 4 +
Allura/allura/tests/model/test_neighborhood.py | 4 +
Allura/allura/tests/model/test_notification.py | 4 +
Allura/allura/tests/model/test_project.py | 4 +
Allura/allura/tests/model/test_repo.py | 4 +
.../tests/templates/jinja_master/test_lib.py | 4 +
Allura/allura/tests/test_app.py | 4 +
Allura/allura/tests/test_commands.py | 4 +
Allura/allura/tests/test_decorators.py | 4 +
Allura/allura/tests/test_diff.py | 4 +
Allura/allura/tests/test_dispatch.py | 4 +
Allura/allura/tests/test_globals.py | 18 +++--
Allura/allura/tests/test_helpers.py | 10 ++-
Allura/allura/tests/test_mail_util.py | 4 +
Allura/allura/tests/test_markdown.py | 4 +
Allura/allura/tests/test_plugin.py | 6 +-
Allura/allura/tests/test_scripttask.py | 4 +
Allura/allura/tests/test_security.py | 4 +
Allura/allura/tests/test_tasks.py | 4 +
Allura/allura/tests/test_utils.py | 6 +-
Allura/allura/tests/test_validators.py | 4 +
Allura/allura/tests/test_webhooks.py | 6 +-
Allura/allura/tests/test_zarkov_helpers.py | 4 +
Allura/allura/tests/tscript.py | 6 +-
Allura/allura/tests/tscript_error.py | 4 +
Allura/allura/tests/unit/__init__.py | 4 +
.../allura/tests/unit/controllers/test_auth.py | 4 +
.../test_discussion_moderation_controller.py | 4 +
.../unit/controllers/test_dispatch_index.py | 4 +
Allura/allura/tests/unit/factories.py | 4 +
Allura/allura/tests/unit/patches.py | 4 +
Allura/allura/tests/unit/spam/test_akismet.py | 4 +
Allura/allura/tests/unit/spam/test_mollom.py | 4 +
.../allura/tests/unit/spam/test_spam_filter.py | 4 +
Allura/allura/tests/unit/test_app.py | 4 +
Allura/allura/tests/unit/test_artifact.py | 4 +
Allura/allura/tests/unit/test_discuss.py | 4 +
.../allura/tests/unit/test_helpers/test_ago.py | 4 +
.../tests/unit/test_helpers/test_set_context.py | 4 +
.../tests/unit/test_ldap_auth_provider.py | 6 +-
Allura/allura/tests/unit/test_mixins.py | 4 +
.../tests/unit/test_package_path_loader.py | 4 +
Allura/allura/tests/unit/test_post_model.py | 4 +
Allura/allura/tests/unit/test_project.py | 4 +
Allura/allura/tests/unit/test_repo.py | 4 +
Allura/allura/tests/unit/test_session.py | 4 +
Allura/allura/tests/unit/test_sitemapentry.py | 4 +
Allura/allura/tests/unit/test_solr.py | 4 +
Allura/allura/version.py | 4 +
Allura/allura/webhooks.py | 4 +
Allura/allura/websetup/__init__.py | 8 +-
Allura/allura/websetup/bootstrap.py | 4 +
Allura/allura/websetup/schema.py | 4 +
Allura/docs/conf.py | 4 +
Allura/ez_setup/__init__.py | 24 +++---
Allura/ldap-setup.py | 8 +-
Allura/ldap-userconfig.py | 10 ++-
Allura/setup.py | 4 +
Allura/test-light.py | 4 +
AlluraTest/alluratest/controller.py | 4 +
AlluraTest/alluratest/test_syntax.py | 8 +-
AlluraTest/alluratest/validation.py | 6 +-
AlluraTest/setup.py | 4 +
ForgeActivity/forgeactivity/__init__.py | 6 +-
ForgeActivity/forgeactivity/config/resources.py | 4 +
ForgeActivity/forgeactivity/main.py | 4 +
.../forgeactivity/tests/functional/test_root.py | 4 +
ForgeActivity/forgeactivity/widgets/follow.py | 4 +
ForgeActivity/setup.py | 4 +
ForgeBlog/forgeblog/command/base.py | 4 +
ForgeBlog/forgeblog/command/rssfeeds.py | 6 +-
ForgeBlog/forgeblog/main.py | 4 +
ForgeBlog/forgeblog/model/__init__.py | 6 +-
ForgeBlog/forgeblog/model/blog.py | 4 +
.../forgeblog/tests/functional/test_rest.py | 4 +
.../forgeblog/tests/functional/test_root.py | 4 +
ForgeBlog/forgeblog/tests/test_app.py | 4 +
ForgeBlog/forgeblog/tests/test_commands.py | 4 +
ForgeBlog/forgeblog/tests/test_roles.py | 4 +
ForgeBlog/forgeblog/tests/unit/__init__.py | 4 +
.../forgeblog/tests/unit/test_blog_post.py | 4 +
ForgeBlog/forgeblog/version.py | 4 +
ForgeBlog/forgeblog/widgets.py | 4 +
ForgeBlog/setup.py | 4 +
ForgeChat/forgechat/command.py | 4 +
ForgeChat/forgechat/main.py | 4 +
ForgeChat/forgechat/model/__init__.py | 6 +-
ForgeChat/forgechat/model/chat.py | 4 +
.../forgechat/tests/functional/test_root.py | 4 +
ForgeChat/forgechat/version.py | 4 +
ForgeChat/setup.py | 4 +
.../forgediscussion/controllers/__init__.py | 6 +-
.../forgediscussion/controllers/forum.py | 4 +
.../forgediscussion/controllers/root.py | 8 +-
ForgeDiscussion/forgediscussion/forum_main.py | 6 +-
.../forgediscussion/import_support.py | 4 +
.../forgediscussion/model/__init__.py | 6 +-
ForgeDiscussion/forgediscussion/model/forum.py | 4 +
ForgeDiscussion/forgediscussion/site_stats.py | 4 +
ForgeDiscussion/forgediscussion/tasks.py | 4 +
.../tests/functional/test_forum.py | 83 ++++++++++----------
.../tests/functional/test_forum_admin.py | 24 +++---
.../tests/functional/test_import.py | 4 +
.../tests/functional/test_rest.py | 9 ++-
.../forgediscussion/tests/test_app.py | 4 +
.../forgediscussion/tests/test_forum_roles.py | 4 +
ForgeDiscussion/forgediscussion/utils.py | 4 +
ForgeDiscussion/forgediscussion/version.py | 4 +
.../forgediscussion/widgets/__init__.py | 10 ++-
.../forgediscussion/widgets/admin.py | 4 +
.../forgediscussion/widgets/forum_widgets.py | 4 +
ForgeDiscussion/setup.py | 4 +
ForgeGit/forgegit/controllers.py | 4 +
ForgeGit/forgegit/git_main.py | 4 +
ForgeGit/forgegit/model/__init__.py | 6 +-
ForgeGit/forgegit/model/git_repo.py | 8 +-
ForgeGit/forgegit/tests/__init__.py | 4 +
ForgeGit/forgegit/tests/functional/test_auth.py | 4 +
.../tests/functional/test_controllers.py | 8 +-
.../forgegit/tests/model/test_repository.py | 8 +-
ForgeGit/forgegit/tests/test_git_app.py | 4 +
ForgeGit/forgegit/tests/test_tasks.py | 4 +
ForgeGit/forgegit/version.py | 4 +
ForgeGit/setup.py | 4 +
ForgeImporters/docs/conf.py | 4 +
ForgeImporters/forgeimporters/base.py | 4 +
ForgeImporters/forgeimporters/forge/tracker.py | 4 +
.../forgeimporters/github/__init__.py | 4 +
ForgeImporters/forgeimporters/github/code.py | 4 +
ForgeImporters/forgeimporters/github/project.py | 4 +
ForgeImporters/forgeimporters/github/tasks.py | 4 +
.../forgeimporters/github/tests/test_code.py | 4 +
.../forgeimporters/github/tests/test_oauth.py | 4 +
.../forgeimporters/github/tests/test_tracker.py | 4 +
.../forgeimporters/github/tests/test_utils.py | 4 +
.../forgeimporters/github/tests/test_wiki.py | 4 +
ForgeImporters/forgeimporters/github/tracker.py | 4 +
ForgeImporters/forgeimporters/github/utils.py | 4 +
ForgeImporters/forgeimporters/github/wiki.py | 4 +
.../forgeimporters/google/__init__.py | 4 +
ForgeImporters/forgeimporters/google/code.py | 4 +
ForgeImporters/forgeimporters/google/project.py | 4 +
ForgeImporters/forgeimporters/google/tasks.py | 4 +
.../forgeimporters/google/tests/test_code.py | 4 +
.../forgeimporters/google/tests/test_init.py | 4 +
ForgeImporters/forgeimporters/google/tracker.py | 4 +
.../forgeimporters/tests/forge/test_tracker.py | 4 +
.../tests/github/functional/test_github.py | 4 +
.../tests/github/test_extractor.py | 4 +
.../forgeimporters/tests/github/test_tasks.py | 4 +
.../forgeimporters/tests/github/test_tracker.py | 4 +
.../tests/google/functional/test_tracker.py | 4 +
.../tests/google/test_extractor.py | 4 +
.../forgeimporters/tests/google/test_tasks.py | 4 +
.../forgeimporters/tests/google/test_tracker.py | 4 +
.../forgeimporters/tests/test_base.py | 4 +
ForgeImporters/forgeimporters/trac/__init__.py | 4 +
ForgeImporters/forgeimporters/trac/project.py | 4 +
.../forgeimporters/trac/tests/test_tickets.py | 4 +
ForgeImporters/forgeimporters/trac/tickets.py | 4 +
ForgeImporters/setup.py | 4 +
ForgeLink/forgelink/link_main.py | 4 +
.../forgelink/tests/functional/test_rest.py | 4 +
.../forgelink/tests/functional/test_root.py | 4 +
ForgeLink/forgelink/tests/test_app.py | 4 +
ForgeLink/forgelink/version.py | 4 +
ForgeLink/setup.py | 4 +
ForgeSVN/forgesvn/controllers.py | 4 +
ForgeSVN/forgesvn/model/__init__.py | 6 +-
ForgeSVN/forgesvn/model/svn.py | 8 +-
ForgeSVN/forgesvn/svn_main.py | 4 +
ForgeSVN/forgesvn/tests/__init__.py | 4 +
ForgeSVN/forgesvn/tests/functional/test_auth.py | 4 +
.../tests/functional/test_controllers.py | 4 +
.../forgesvn/tests/model/test_repository.py | 22 +++---
.../tests/model/test_svnimplementation.py | 4 +
ForgeSVN/forgesvn/tests/test_svn_app.py | 4 +
ForgeSVN/forgesvn/tests/test_tasks.py | 4 +
ForgeSVN/forgesvn/version.py | 4 +
ForgeSVN/forgesvn/widgets.py | 4 +
ForgeSVN/setup.py | 6 +-
ForgeShortUrl/forgeshorturl/main.py | 4 +
ForgeShortUrl/forgeshorturl/model/__init__.py | 4 +
ForgeShortUrl/forgeshorturl/model/shorturl.py | 4 +
.../forgeshorturl/tests/functional/test.py | 4 +
.../forgeshorturl/widgets/short_url.py | 4 +
ForgeShortUrl/setup.py | 4 +
.../forgetracker/command/fix_discussion.py | 4 +
ForgeTracker/forgetracker/config/resources.py | 4 +
ForgeTracker/forgetracker/import_support.py | 6 +-
ForgeTracker/forgetracker/model/__init__.py | 6 +-
ForgeTracker/forgetracker/model/ticket.py | 14 ++--
ForgeTracker/forgetracker/plugins.py | 4 +
ForgeTracker/forgetracker/search.py | 4 +
ForgeTracker/forgetracker/site_stats.py | 4 +
ForgeTracker/forgetracker/tasks.py | 4 +
.../tests/command/test_fix_discussion.py | 4 +
.../forgetracker/tests/functional/test_rest.py | 4 +
.../forgetracker/tests/functional/test_root.py | 38 +++++----
ForgeTracker/forgetracker/tests/test_app.py | 4 +
.../forgetracker/tests/test_tracker_roles.py | 4 +
.../forgetracker/tests/unit/__init__.py | 4 +
.../tests/unit/test_globals_model.py | 4 +
.../tests/unit/test_milestone_controller.py | 4 +
.../tests/unit/test_root_controller.py | 4 +
.../forgetracker/tests/unit/test_search.py | 4 +
.../unit/test_ticket_custom_fields_form.py | 4 +
.../forgetracker/tests/unit/test_ticket_form.py | 4 +
.../tests/unit/test_ticket_model.py | 4 +
ForgeTracker/forgetracker/tracker_main.py | 8 +-
ForgeTracker/forgetracker/version.py | 4 +
ForgeTracker/forgetracker/widgets/admin.py | 4 +
.../forgetracker/widgets/admin_custom_fields.py | 4 +
ForgeTracker/forgetracker/widgets/bin_form.py | 4 +
.../forgetracker/widgets/ticket_form.py | 4 +
.../forgetracker/widgets/ticket_search.py | 4 +
ForgeTracker/setup.py | 4 +
.../forgeuserstats/controllers/userstats.py | 6 +-
ForgeUserStats/forgeuserstats/main.py | 8 +-
ForgeUserStats/forgeuserstats/model/stats.py | 4 +
.../forgeuserstats/tests/test_model.py | 12 ++-
.../forgeuserstats/tests/test_stats.py | 4 +
ForgeUserStats/forgeuserstats/version.py | 4 +
ForgeUserStats/forgeuserstats/widgets/forms.py | 4 +
ForgeUserStats/setup.py | 4 +
ForgeWiki/forgewiki/converters.py | 4 +
ForgeWiki/forgewiki/model/__init__.py | 6 +-
ForgeWiki/forgewiki/model/wiki.py | 4 +
.../forgewiki/tests/functional/test_rest.py | 4 +
.../forgewiki/tests/functional/test_root.py | 4 +
ForgeWiki/forgewiki/tests/test_app.py | 4 +
ForgeWiki/forgewiki/tests/test_converters.py | 4 +
ForgeWiki/forgewiki/tests/test_models.py | 4 +
ForgeWiki/forgewiki/tests/test_wiki_roles.py | 4 +
ForgeWiki/forgewiki/version.py | 4 +
ForgeWiki/forgewiki/widgets/wiki.py | 4 +
ForgeWiki/forgewiki/wiki_main.py | 4 +
ForgeWiki/setup.py | 4 +
fuse/accessfs.py | 14 ++--
scripts/ApacheAccessHandler.py | 4 +
scripts/add_user_to_group.py | 4 +
scripts/allura_import.py | 10 ++-
scripts/changelog.py | 10 ++-
scripts/create-allura-sitemap.py | 12 ++-
scripts/create-moved-tickets.py | 10 ++-
scripts/fix-wiki-page-names.py | 4 +
scripts/import_trove_categories.py | 4 +
scripts/migrations/000-fix-tracker-fields.py | 4 +
scripts/migrations/001-restore-labels.py | 4 +
.../002-fix-tracker-thread-subjects.py | 4 +
scripts/migrations/003-migrate_project_roles.py | 4 +
.../004-make-attachments-polymorphic.py | 4 +
...005-remove_duplicate_ticket_notifications.py | 12 ++-
scripts/migrations/006-migrate-artifact-refs.py | 4 +
scripts/migrations/007-update-acls.py | 12 ++-
.../migrations/008-remove-forumpost-subject.py | 4 +
scripts/migrations/009-set_landing_page.py | 4 +
scripts/migrations/010-fix-home-permissions.py | 4 +
scripts/migrations/011-fix-subroles.py | 4 +
scripts/migrations/012-uninstall-home.py | 4 +
scripts/migrations/013-update-ordinals.py | 4 +
.../015-add-neighborhood_id-to-blog-posts.py | 4 +
scripts/migrations/018-add-svn-checkout-url.py | 4 +
.../migrations/020-remove-wiki-title-slashes.py | 8 +-
.../migrations/022-change-anon-display-name.py | 4 +
.../024-migrate-custom-profile-text.py | 4 +
scripts/migrations/025-add-is-nbhd-project.py | 4 +
scripts/migrations/026-install-activity-tool.py | 4 +
.../027-change-ticket-write-permissions.py | 4 +
scripts/migrations/028-remove-svn-trees.py | 10 ++-
.../migrations/029-set-mailbox-queue_empty.py | 4 +
.../migrations/031-set-user-pending-to-false.py | 6 +-
scripts/new_ticket.py | 14 ++--
scripts/open_relay.py | 4 +
scripts/perf/benchmark-scm.py | 10 ++-
scripts/perf/call_count.py | 12 ++-
scripts/perf/generate-projects.py | 10 ++-
scripts/perf/md_perf.py | 20 +++--
scripts/perf/sstress.py | 8 +-
scripts/perf/test_git_lcd.py | 8 +-
scripts/prep-scm-sandbox.py | 16 ++--
scripts/prepare-allura-tickets-for-import.py | 4 +
scripts/project-import.py | 8 +-
scripts/publicize-neighborhood.py | 4 +
scripts/recover-user-databases.py | 4 +
scripts/rethumb.py | 6 +-
scripts/scrub-allura-data.py | 4 +
scripts/setup-scm-server.py | 4 +
scripts/teamforge-import.py | 6 +-
scripts/test-branches-against-tickets.py | 4 +
scripts/trac_export.py | 4 +
scripts/wiki-copy.py | 16 ++--
scripts/wiki-export.py | 4 +
scripts/wiki-post.py | 10 ++-
444 files changed, 2142 insertions(+), 378 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/__init__.py b/Allura/allura/__init__.py
index ebf903b..ef58e09 100644
--- a/Allura/allura/__init__.py
+++ b/Allura/allura/__init__.py
@@ -18,6 +18,10 @@
# under the License.
"""The allura package"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from paste.registry import StackedObjectProxy
credentials = StackedObjectProxy(name='credentials')
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 3e226db..1657a14 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -660,7 +664,7 @@ class Application(object):
Set exportable to True for applications implementing this.
"""
- raise NotImplementedError, 'bulk_export'
+ raise NotImplementedError('bulk_export')
def doap(self, parent):
"""App's representation for DOAP API.
@@ -759,7 +763,7 @@ class DefaultAdminController(BaseController):
"""Render the permissions management web page.
"""
- from ext.admin.widgets import PermissionCard, BlockUser, BlockList
+ from .ext.admin.widgets import PermissionCard, BlockUser, BlockList
c.card = PermissionCard()
c.block_user = BlockUser()
c.block_list = BlockList()
@@ -921,4 +925,4 @@ class WebhooksLookup(BaseController):
for hook in self.app._webhooks:
if hook.type == name and hook.controller:
return hook.controller(hook, self.app), remainder
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/command/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/__init__.py b/Allura/allura/command/__init__.py
index 24254aa..a13d46a 100644
--- a/Allura/allura/command/__init__.py
+++ b/Allura/allura/command/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,10 +19,10 @@
# specific language governing permissions and limitations
# under the License.
-from base import Command
-from show_models import ShowModelsCommand, ReindexCommand, EnsureIndexCommand
-from script import ScriptCommand, SetToolAccessCommand
-from smtp_server import SMTPServerCommand
-from create_neighborhood import CreateNeighborhoodCommand, UpdateNeighborhoodCommand
-from create_trove_categories import CreateTroveCategoriesCommand
-from set_neighborhood_features import SetNeighborhoodFeaturesCommand
+from .base import Command
+from .show_models import ShowModelsCommand, ReindexCommand, EnsureIndexCommand
+from .script import ScriptCommand, SetToolAccessCommand
+from .smtp_server import SMTPServerCommand
+from .create_neighborhood import CreateNeighborhoodCommand, UpdateNeighborhoodCommand
+from .create_trove_categories import CreateTroveCategoriesCommand
+from .set_neighborhood_features import SetNeighborhoodFeaturesCommand
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/command/base.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/base.py b/Allura/allura/command/base.py
index 3d619fc..98c39e1 100644
--- a/Allura/allura/command/base.py
+++ b/Allura/allura/command/base.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/command/create_neighborhood.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/create_neighborhood.py b/Allura/allura/command/create_neighborhood.py
index db79bb0..4456308 100644
--- a/Allura/allura/command/create_neighborhood.py
+++ b/Allura/allura/command/create_neighborhood.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/command/create_trove_categories.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/create_trove_categories.py b/Allura/allura/command/create_trove_categories.py
index eba9244..f1ddcd6 100644
--- a/Allura/allura/command/create_trove_categories.py
+++ b/Allura/allura/command/create_trove_categories.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/command/reclone_repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/reclone_repo.py b/Allura/allura/command/reclone_repo.py
index d401b0b..dcde7d5 100644
--- a/Allura/allura/command/reclone_repo.py
+++ b/Allura/allura/command/reclone_repo.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/command/script.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/script.py b/Allura/allura/command/script.py
index 1f2c93a..59e1416 100644
--- a/Allura/allura/command/script.py
+++ b/Allura/allura/command/script.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -85,10 +89,10 @@ class SetToolAccessCommand(base.Command):
' so removing from list.')
continue
if s not in ('alpha', 'beta'):
- print 'Unknown tool status %s' % s
+ print('Unknown tool status %s' % s)
sys.exit(1)
extra_status.append(s)
- print 'Setting project "%s" tool access to production + %r' % (
- self.args[1], extra_status)
+ print('Setting project "%s" tool access to production + %r' % (
+ self.args[1], extra_status))
c.project._extra_tool_status = extra_status
session(c.project).flush()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/command/set_neighborhood_features.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/set_neighborhood_features.py b/Allura/allura/command/set_neighborhood_features.py
index 36ba22b..f3fbaac 100644
--- a/Allura/allura/command/set_neighborhood_features.py
+++ b/Allura/allura/command/set_neighborhood_features.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/command/show_models.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/show_models.py b/Allura/allura/command/show_models.py
index d941e9e..aeda893 100644
--- a/Allura/allura/command/show_models.py
+++ b/Allura/allura/command/show_models.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -46,7 +50,7 @@ class ShowModelsCommand(base.Command):
graph = build_model_inheritance_graph()
for depth, cls in dfs(MappedClass, graph):
for line in dump_cls(depth, cls):
- print line
+ print(line)
class ReindexCommand(base.Command):
@@ -136,7 +140,7 @@ class ReindexCommand(base.Command):
M.artifact_orm_session.clear()
try:
self._chunked_add_artifacts(ref_ids)
- except CompoundError, err:
+ except CompoundError as err:
base.log.exception(
'Error indexing artifacts:\n%r', err)
base.log.error('%s', err.format_error())
@@ -284,7 +288,7 @@ class EnsureIndexCommand(base.Command):
try:
collection.ensure_index(idx.index_spec, unique=True)
break
- except DuplicateKeyError, err:
+ except DuplicateKeyError as err:
base.log.info('Found dupe key(%s), eliminating dupes', err)
self._remove_dupes(collection, idx.index_spec)
for keys, idx in indexes.iteritems():
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/command/smtp_server.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/smtp_server.py b/Allura/allura/command/smtp_server.py
index 40008d7..7e98b88 100644
--- a/Allura/allura/command/smtp_server.py
+++ b/Allura/allura/command/smtp_server.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/command/taskd.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/taskd.py b/Allura/allura/command/taskd.py
index 409e701..a25599e 100644
--- a/Allura/allura/command/taskd.py
+++ b/Allura/allura/command/taskd.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -32,7 +36,7 @@ from paste.deploy import loadapp
from paste.deploy.converters import asint
from webob import Request
-import base
+from . import base
faulthandler.enable()
@@ -193,7 +197,7 @@ class TaskCommand(base.Command):
else:
q = dict(state=self.options.state)
for t in M.MonQTask.query.find(q):
- print t
+ print(t)
def _retry(self):
'''Retry tasks in an error state'''
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/command/taskd_cleanup.py
----------------------------------------------------------------------
diff --git a/Allura/allura/command/taskd_cleanup.py b/Allura/allura/command/taskd_cleanup.py
index 517917f..cdb8032 100644
--- a/Allura/allura/command/taskd_cleanup.py
+++ b/Allura/allura/command/taskd_cleanup.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -23,7 +27,7 @@ import subprocess
from ming.orm.ormsession import ThreadLocalORMSession
from allura import model as M
-import base
+from . import base
class TaskdCleanupCommand(base.Command):
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/config/app_cfg.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/app_cfg.py b/Allura/allura/config/app_cfg.py
index b21979b..d898e10 100644
--- a/Allura/allura/config/app_cfg.py
+++ b/Allura/allura/config/app_cfg.py
@@ -30,6 +30,10 @@ convert them into boolean, for example, you should use the
setting = asbool(global_conf.get('the_setting'))
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
from functools import partial
@@ -123,7 +127,7 @@ class JinjaEngine(ew.TemplateEngine):
try:
return self._environ.get_template(template_name)
except jinja2.TemplateNotFound:
- raise ew.errors.TemplateNotFound, '%s not found' % template_name
+ raise ew.errors.TemplateNotFound('%s not found' % template_name)
def parse(self, template_text, filepath=None):
return self._environ.from_string(template_text)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/config/environment.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/environment.py b/Allura/allura/config/environment.py
index 35676fd..445303a 100644
--- a/Allura/allura/config/environment.py
+++ b/Allura/allura/config/environment.py
@@ -18,6 +18,10 @@
# under the License.
"""WSGI environment setup for allura."""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import pylons.middleware
import tg
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/config/middleware.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/middleware.py b/Allura/allura/config/middleware.py
index 840a39c..6efe711 100644
--- a/Allura/allura/config/middleware.py
+++ b/Allura/allura/config/middleware.py
@@ -18,6 +18,10 @@
# under the License.
"""WSGI middleware initialization for the allura application."""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import mimetypes
import pylons.middleware
@@ -121,9 +125,9 @@ def _make_core_app(root, global_conf, full_stack=True, **app_conf):
try:
import zmq
except ImportError:
- raise ImportError, "Unable to import the zmq library. Please"\
+ raise ImportError("Unable to import the zmq library. Please"\
" check that zeromq is installed or comment out"\
- " the zarkov.host setting in your ini file."
+ " the zarkov.host setting in your ini file.")
app = tg.TGApp()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/config/resources.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/resources.py b/Allura/allura/config/resources.py
index e8717fe..e24ad0d 100644
--- a/Allura/allura/config/resources.py
+++ b/Allura/allura/config/resources.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/__init__.py b/Allura/allura/controllers/__init__.py
index a69bafb..9a50246 100644
--- a/Allura/allura/controllers/__init__.py
+++ b/Allura/allura/controllers/__init__.py
@@ -18,6 +18,10 @@
# under the License.
"""Controllers for the allura application."""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from .discuss import DiscussionController, AppDiscussionController, ThreadController, PostController, ModerationController
from .discuss import AppDiscussionRestController
from .base import BaseController, DispatchIndex
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/attachments.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/attachments.py b/Allura/allura/controllers/attachments.py
index a648873..708da30 100644
--- a/Allura/allura/controllers/attachments.py
+++ b/Allura/allura/controllers/attachments.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index f4f03c9..fbc12e2 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -588,7 +592,7 @@ class PreferencesController(BaseController):
ap = plugin.AuthenticationProvider.get(request)
try:
ap.upload_sshkey(c.user.username, key)
- except AssertionError, ae:
+ except AssertionError as ae:
flash('Error uploading key: %s' % ae, 'error')
flash('Key uploaded')
redirect('.')
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/base.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/base.py b/Allura/allura/controllers/base.py
index 215b19d..524d586 100644
--- a/Allura/allura/controllers/base.py
+++ b/Allura/allura/controllers/base.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -26,7 +30,7 @@ class BaseController(object):
def _lookup(self, name=None, *remainder):
"""Provide explicit default lookup to avoid dispatching backtracking
and possible loops."""
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
class DispatchIndex(object):
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/basetest_project_root.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/basetest_project_root.py b/Allura/allura/controllers/basetest_project_root.py
index f655437..3b0f83a 100644
--- a/Allura/allura/controllers/basetest_project_root.py
+++ b/Allura/allura/controllers/basetest_project_root.py
@@ -18,6 +18,10 @@
# under the License.
"""Main Controller"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
from urllib import unquote
@@ -94,7 +98,7 @@ class BasetestProjectRootController(WsgiDispatchController, ProjectController):
@expose()
def _lookup(self, name, *remainder):
if not h.re_project_name.match(name):
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
subproject = M.Project.query.get(
shortname=c.project.shortname + '/' + name,
neighborhood_id=self.p_nbhd._id)
@@ -111,10 +115,10 @@ class BasetestProjectRootController(WsgiDispatchController, ProjectController):
try:
c.project.install_app(ep_name, name)
except KeyError:
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
app = c.project.app_instance(name)
if app is None:
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
c.app = app
return app.root, remainder
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/discuss.py b/Allura/allura/controllers/discuss.py
index c7fe163..8a906e8 100644
--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -27,7 +31,7 @@ from ming.base import Object
from ming.utils import LazyProperty
from allura import model as M
-from base import BaseController
+from .base import BaseController
from allura.lib import utils
from allura.lib import helpers as h
from allura.lib.decorators import require_post
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/error.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/error.py b/Allura/allura/controllers/error.py
index 682b46d..86b1ea4 100644
--- a/Allura/allura/controllers/error.py
+++ b/Allura/allura/controllers/error.py
@@ -18,6 +18,10 @@
# under the License.
"""Error controller"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from tg import request, expose
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/feed.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/feed.py b/Allura/allura/controllers/feed.py
index 7aaa789..408b875 100644
--- a/Allura/allura/controllers/feed.py
+++ b/Allura/allura/controllers/feed.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 201ee54..acf8427 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -125,10 +129,10 @@ class NeighborhoodController(object):
pname, remainder)
project.configure_project(is_user_project=True)
else:
- raise exc.HTTPNotFound, pname
+ raise exc.HTTPNotFound(pname)
c.project = project
if project is None or (project.deleted and not has_access(c.project, 'update')()):
- raise exc.HTTPNotFound, pname
+ raise exc.HTTPNotFound(pname)
return ProjectController(), remainder
@expose('jinja:allura:templates/neighborhood_project_list.html')
@@ -366,10 +370,10 @@ class ProjectController(FeedController):
return ProjectController(), remainder
app = c.project.app_instance(name)
if app is None:
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
c.app = app
if not app.root:
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
return app.root, remainder
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index b630e77..3052abf 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -148,7 +152,7 @@ class RepoRootController(BaseController, FeedController):
redirect(to_project.url() + mount_point + '/')
except exc.HTTPRedirection:
raise
- except Exception, ex:
+ except Exception as ex:
flash(str(ex), 'error')
redirect(request.referer)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/rest.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/rest.py b/Allura/allura/controllers/rest.py
index 8eafa30..83c50e1 100644
--- a/Allura/allura/controllers/rest.py
+++ b/Allura/allura/controllers/rest.py
@@ -18,6 +18,10 @@
# under the License.
"""REST Controller"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
import oauth2 as oauth
@@ -93,7 +97,7 @@ class RestController(object):
c.user = c.api_token.user
neighborhood = M.Neighborhood.query.get(url_prefix='/' + name + '/')
if not neighborhood:
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
return NeighborhoodRestController(neighborhood), remainder
@@ -263,12 +267,12 @@ class NeighborhoodRestController(object):
provider.shortname_validator.to_python(
name, check_allowed=False, neighborhood=self._neighborhood)
except Invalid:
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
name = self._neighborhood.shortname_prefix + name
project = M.Project.query.get(
shortname=name, neighborhood_id=self._neighborhood._id, deleted=False)
if not project:
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
if project and name and name.startswith('u/'):
# make sure user-projects are associated with an enabled user
@@ -296,10 +300,10 @@ class ProjectRestController(object):
return ProjectRestController(), remainder
app = c.project.app_instance(name)
if app is None:
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
c.app = app
if app.api_root is None:
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
action_logger.info('', extra=dict(
api_key=request.params.get('api_key')))
return app.api_root, remainder
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/root.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/root.py b/Allura/allura/controllers/root.py
index a0418d0..9389c91 100644
--- a/Allura/allura/controllers/root.py
+++ b/Allura/allura/controllers/root.py
@@ -18,6 +18,10 @@
# under the License.
"""Main Controller"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
from tg import expose, request, config, session
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/search.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/search.py b/Allura/allura/controllers/search.py
index eaf8446..9de8c7c 100644
--- a/Allura/allura/controllers/search.py
+++ b/Allura/allura/controllers/search.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -66,7 +70,7 @@ class ProjectBrowseController(BaseController):
self.category = M.ProjectCategory.query.find(
dict(name=category_name, parent_id=parent_id)).first()
if not self.category:
- raise exc.HTTPNotFound, request.path
+ raise exc.HTTPNotFound(request.path)
else:
self.category = None
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/secure.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/secure.py b/Allura/allura/controllers/secure.py
index 899ad42..8defdb6 100644
--- a/Allura/allura/controllers/secure.py
+++ b/Allura/allura/controllers/secure.py
@@ -18,6 +18,10 @@
# under the License.
"""Sample controller with all its actions protected."""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# This controller is only used when you activate auth. You can safely remove
# this file from your project.
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/site_admin.py b/Allura/allura/controllers/site_admin.py
index ee47274..a1dc858 100644
--- a/Allura/allura/controllers/site_admin.py
+++ b/Allura/allura/controllers/site_admin.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -76,7 +80,7 @@ class SiteAdminController(object):
controller = admin_extension().controllers.get(name)
if controller:
return controller(), remainder
- raise HTTPNotFound, name
+ raise HTTPNotFound(name)
def sidebar_menu(self):
base_url = '/nf/admin/'
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/static.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/static.py b/Allura/allura/controllers/static.py
index 313a877..fd63d70 100644
--- a/Allura/allura/controllers/static.py
+++ b/Allura/allura/controllers/static.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/task.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/task.py b/Allura/allura/controllers/task.py
index cb666ee..2f8de2e 100644
--- a/Allura/allura/controllers/task.py
+++ b/Allura/allura/controllers/task.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/template.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/template.py b/Allura/allura/controllers/template.py
index 89d4b11..17c3f2d 100644
--- a/Allura/allura/controllers/template.py
+++ b/Allura/allura/controllers/template.py
@@ -18,6 +18,10 @@
# under the License.
"""Fallback controller."""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from pylons.controllers.util import abort
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/controllers/trovecategories.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/trovecategories.py b/Allura/allura/controllers/trovecategories.py
index b57e517..2543ba7 100644
--- a/Allura/allura/controllers/trovecategories.py
+++ b/Allura/allura/controllers/trovecategories.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/eventslistener.py
----------------------------------------------------------------------
diff --git a/Allura/allura/eventslistener.py b/Allura/allura/eventslistener.py
index f9f7431..28ac2cc 100644
--- a/Allura/allura/eventslistener.py
+++ b/Allura/allura/eventslistener.py
@@ -19,6 +19,10 @@
a specific entity (e.g. user, project, ...). To do so, the new classes should
overwrite the methods defined here, which will be called when the related
event happens, so that the statistics for the given entity are updated.'''
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
class EventsListener:
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/ext/admin/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/__init__.py b/Allura/allura/ext/admin/__init__.py
index 2a46058..c045bd3 100644
--- a/Allura/allura/ext/admin/__init__.py
+++ b/Allura/allura/ext/admin/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index b51c816..08c1b71 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -189,7 +193,7 @@ class AdminExtensionLookup(object):
controller = admin_extension().project_admin_controllers.get(name)
if controller:
return controller(), remainder
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
class ProjectAdminController(BaseController):
@@ -339,7 +343,7 @@ class ProjectAdminController(BaseController):
def _lookup(self, name, *remainder):
app = c.project.app_instance(name)
if app is None:
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
return app.admin, remainder
@expose()
@@ -691,7 +695,7 @@ class ProjectAdminController(BaseController):
if new_app:
# force redir to last page of tools, where new app will be
page = ''
- except forge_exc.ForgeError, exc:
+ except forge_exc.ForgeError as exc:
flash('%s: %s' % (exc.__class__.__name__, exc.args[0]),
'error')
redirect('tools?limit=%s&page=%s' % (limit, page))
@@ -887,11 +891,11 @@ class ProjectAdminRestController(BaseController):
@expose()
def _lookup(self, *args):
if len(args) == 0:
- raise exc.HTTPNotFound, args
+ raise exc.HTTPNotFound(args)
name, remainder = args[0], args[1:]
app = c.project.app_instance(name)
if app is None or app.admin_api_root is None:
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
return app.admin_api_root, remainder
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/ext/admin/widgets.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/widgets.py b/Allura/allura/ext/admin/widgets.py
index 5fb5bbd..068e203 100644
--- a/Allura/allura/ext/admin/widgets.py
+++ b/Allura/allura/ext/admin/widgets.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/ext/project_home/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/project_home/__init__.py b/Allura/allura/ext/project_home/__init__.py
index c3be50e..d523d65 100644
--- a/Allura/allura/ext/project_home/__init__.py
+++ b/Allura/allura/ext/project_home/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/ext/project_home/project_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/project_home/project_main.py b/Allura/allura/ext/project_home/project_main.py
index a02b807..cb28555 100644
--- a/Allura/allura/ext/project_home/project_main.py
+++ b/Allura/allura/ext/project_home/project_main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/ext/search/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/search/__init__.py b/Allura/allura/ext/search/__init__.py
index a0bc037..2c6e656 100644
--- a/Allura/allura/ext/search/__init__.py
+++ b/Allura/allura/ext/search/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/ext/search/search_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/search/search_main.py b/Allura/allura/ext/search/search_main.py
index 99c5dfc..7678128 100644
--- a/Allura/allura/ext/search/search_main.py
+++ b/Allura/allura/ext/search/search_main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/ext/user_profile/__init__.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/user_profile/__init__.py b/Allura/allura/ext/user_profile/__init__.py
index 5b323d6..9569e6c 100644
--- a/Allura/allura/ext/user_profile/__init__.py
+++ b/Allura/allura/ext/user_profile/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/ext/user_profile/user_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/user_profile/user_main.py b/Allura/allura/ext/user_profile/user_main.py
index 2f71deb..f8ec1c5 100644
--- a/Allura/allura/ext/user_profile/user_main.py
+++ b/Allura/allura/ext/user_profile/user_main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/AsciiDammit.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/AsciiDammit.py b/Allura/allura/lib/AsciiDammit.py
index d86c26d..afbd460 100644
--- a/Allura/allura/lib/AsciiDammit.py
+++ b/Allura/allura/lib/AsciiDammit.py
@@ -16,6 +16,10 @@ To the extent that this statement does not divest the copyright,
the copyright holder hereby grants irrevocably to every recipient
all rights in this work otherwise reserved under copyright.
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
__author__ = "Leonard Richardson (leonardr@segfault.org)"
__version__ = "$Revision: 1.3 $"
@@ -173,7 +177,7 @@ def _repl(match, html=0):
"Replace the matched character with its HTML or ASCII equivalent."
g = match.group(0)
a = CHARS.get(g, g)
- if type(a) == types.TupleType:
+ if type(a) == tuple:
a = a[html]
if html:
a = '&' + a + ';'
@@ -213,11 +217,11 @@ def demoronise(t):
if __name__ == '__main__':
french = '\x93Sacr\xe9 bleu!\x93'
- print "First we mangle some French."
- print asciiDammit(french)
- print htmlDammit(french)
-
- print
- print "And now we fix the MS-quotes but leave the French alone."
- print demoronise(french)
- print htmlDammit(french, 1)
+ print("First we mangle some French.")
+ print(asciiDammit(french))
+ print(htmlDammit(french))
+
+ print()
+ print("And now we fix the MS-quotes but leave the French alone.")
+ print(demoronise(french))
+ print(htmlDammit(french, 1))
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index e9879de..31c8db8 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -19,6 +19,10 @@
"""The application's Globals object"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
__all__ = ['Globals']
import logging
@@ -387,7 +391,7 @@ class Globals(object):
self._zarkov = ZarkovClient(
config.get('zarkov.host', 'tcp://127.0.0.1:6543'))
self._zarkov.event(event_type, context, extra)
- except Exception, ex:
+ except Exception as ex:
self._zarkov = None
log.error('Error sending zarkov event(%r): %r', ex, dict(
type=event_type, context=context, extra=extra))
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/base.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/base.py b/Allura/allura/lib/base.py
index b0c9050..4a89127 100644
--- a/Allura/allura/lib/base.py
+++ b/Allura/allura/lib/base.py
@@ -18,6 +18,10 @@
# under the License.
"""The base Controller API."""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from webob import exc
import pylons
from tg import TGController
@@ -37,10 +41,10 @@ class WsgiDispatchController(TGController):
def _setup_request(self):
'''Responsible for setting all the values we need to be set on pylons.tmpl_context'''
- raise NotImplementedError, '_setup_request'
+ raise NotImplementedError('_setup_request')
def _cleanup_request(self):
- raise NotImplementedError, '_cleanup_request'
+ raise NotImplementedError('_cleanup_request')
def __call__(self, environ, start_response):
try:
@@ -48,7 +52,7 @@ class WsgiDispatchController(TGController):
response = super(WsgiDispatchController, self).__call__(
environ, start_response)
return self.cleanup_iterator(response)
- except exc.HTTPException, err:
+ except exc.HTTPException as err:
return err(environ, start_response)
def cleanup_iterator(self, response):
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/custom_middleware.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/custom_middleware.py b/Allura/allura/lib/custom_middleware.py
index 8212cd2..14e0ebd 100644
--- a/Allura/allura/lib/custom_middleware.py
+++ b/Allura/allura/lib/custom_middleware.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/decorators.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/decorators.py b/Allura/allura/lib/decorators.py
index cb5cfc5..f39d75d 100644
--- a/Allura/allura/lib/decorators.py
+++ b/Allura/allura/lib/decorators.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -137,7 +141,7 @@ class log_action(object): # pragma no cover
result = self._func(*args, **kwargs)
except exc.HTTPServerError:
raise
- except exc.HTTPException, e:
+ except exc.HTTPException as e:
result = e
args = self._args
kwargs = self._kwargs
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/diff.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/diff.py b/Allura/allura/lib/diff.py
index 2691b65..dfae26e 100644
--- a/Allura/allura/lib/diff.py
+++ b/Allura/allura/lib/diff.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/exceptions.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/exceptions.py b/Allura/allura/lib/exceptions.py
index 8a33658..fd7205f 100644
--- a/Allura/allura/lib/exceptions.py
+++ b/Allura/allura/lib/exceptions.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/gravatar.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/gravatar.py b/Allura/allura/lib/gravatar.py
index 0e03be2..9f8ff8d 100644
--- a/Allura/allura/lib/gravatar.py
+++ b/Allura/allura/lib/gravatar.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index 36932a3..14eea82 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import sys
import os
import os.path
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/import_api.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/import_api.py b/Allura/allura/lib/import_api.py
index 60754a6..b81e54d 100644
--- a/Allura/allura/lib/import_api.py
+++ b/Allura/allura/lib/import_api.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -51,7 +55,7 @@ class AlluraImportApiClient(object):
result = urllib2.urlopen(url, urllib.urlencode(params))
resp = result.read()
return json.loads(resp)
- except urllib2.HTTPError, e:
+ except urllib2.HTTPError as e:
e.msg += ' ({0})'.format(url)
if self.verbose:
error_content = e.read()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/macro.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/macro.py b/Allura/allura/lib/macro.py
index fd0ef58..47475e3 100644
--- a/Allura/allura/lib/macro.py
+++ b/Allura/allura/lib/macro.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -78,7 +82,7 @@ class parse(object):
exc_info=True)
msg = cgi.escape(u'[[%s]] (%s)' % (s, repr(ex)))
return '\n<div class="error"><pre><code>%s</code></pre></div>' % msg
- except Exception, ex:
+ except Exception as ex:
raise
return '[[Error parsing %s: %s]]' % (s, ex)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/mail_util.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/mail_util.py b/Allura/allura/lib/mail_util.py
index 68a9649..cfadaaf 100644
--- a/Allura/allura/lib/mail_util.py
+++ b/Allura/allura/lib/mail_util.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -101,18 +105,18 @@ def parse_address(addr):
userpart, domain = addr.split('@')
# remove common domain suffix
if not domain.endswith(config.common_suffix):
- raise exc.AddressException, 'Unknown domain: ' + domain
+ raise exc.AddressException('Unknown domain: ' + domain)
domain = domain[:-len(config.common_suffix)]
path = '/'.join(reversed(domain.split('.')))
project, mount_point = h.find_project('/' + path)
if project is None:
- raise exc.AddressException, 'Unknown project: ' + domain
+ raise exc.AddressException('Unknown project: ' + domain)
if len(mount_point) != 1:
- raise exc.AddressException, 'Unknown tool: ' + domain
+ raise exc.AddressException('Unknown tool: ' + domain)
with h.push_config(c, project=project):
app = project.app_instance(mount_point[0])
if not app:
- raise exc.AddressException, 'Unknown tool: ' + domain
+ raise exc.AddressException('Unknown tool: ' + domain)
return userpart, project, app
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/markdown_extensions.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/markdown_extensions.py b/Allura/allura/lib/markdown_extensions.py
index 055a74a..005fa8d 100644
--- a/Allura/allura/lib/markdown_extensions.py
+++ b/Allura/allura/lib/markdown_extensions.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/package_path_loader.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/package_path_loader.py b/Allura/allura/lib/package_path_loader.py
index be28fed..6c1ee99 100644
--- a/Allura/allura/lib/package_path_loader.py
+++ b/Allura/allura/lib/package_path_loader.py
@@ -122,6 +122,10 @@ The positioners are:
**TODO:** Support multiple partial themes
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import pkg_resources
import os
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/patches.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/patches.py b/Allura/allura/lib/patches.py
index 2c363ea..540726a 100644
--- a/Allura/allura/lib/patches.py
+++ b/Allura/allura/lib/patches.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -65,7 +69,7 @@ def apply():
override_mapping = request._override_mapping
except AttributeError:
override_mapping = request._override_mapping = {}
- override_mapping[controller.im_func] = {content_type: template}
+ override_mapping[controller.__func__] = {content_type: template}
@h.monkeypatch(tg, tg.decorators)
@decorator
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index fb1c3b9..d7c3a83 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -18,6 +18,10 @@
'''
Allura plugins for authentication and project registration
'''
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import re
import os
import logging
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/Allura/allura/lib/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/repository.py b/Allura/allura/lib/repository.py
index 31e1395..a4d7ec3 100644
--- a/Allura/allura/lib/repository.py
+++ b/Allura/allura/lib/repository.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -330,4 +334,4 @@ class RestWebhooksLookup(BaseController):
for hook in self.app._webhooks:
if hook.type == name and hook.api_controller:
return hook.api_controller(hook, self.app), remainder
- raise exc.HTTPNotFound, name
+ raise exc.HTTPNotFound(name)
[08/14] allura git commit: [#7878] ticket:771 Convert all
ming.collection names to bytes
Posted by je...@apache.org.
[#7878] ticket:771 Convert all ming.collection names to bytes
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/9b6e0b5a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/9b6e0b5a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/9b6e0b5a
Branch: refs/heads/ib/7878
Commit: 9b6e0b5a225edd33b3a51d96a00f26c171e2cb5d
Parents: e900dda
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue May 19 10:26:16 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue May 19 10:26:16 2015 +0000
----------------------------------------------------------------------
Allura/allura/model/auth.py | 2 +-
Allura/allura/model/index.py | 4 ++--
Allura/allura/model/repository.py | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/9b6e0b5a/Allura/allura/model/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
index 71a7bf1..e5c913a 100644
--- a/Allura/allura/model/auth.py
+++ b/Allura/allura/model/auth.py
@@ -965,7 +965,7 @@ class ProjectRole(MappedClass):
audit_log = collection(
- 'audit_log', main_doc_session,
+ b'audit_log', main_doc_session,
Field('_id', S.ObjectId()),
Field('project_id', S.ObjectId, if_missing=None,
index=True), # main view of audit log queries by project_id
http://git-wip-us.apache.org/repos/asf/allura/blob/9b6e0b5a/Allura/allura/model/index.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/index.py b/Allura/allura/model/index.py
index cd4be6e..db4758a 100644
--- a/Allura/allura/model/index.py
+++ b/Allura/allura/model/index.py
@@ -45,7 +45,7 @@ log = logging.getLogger(__name__)
# Collection definitions
ArtifactReferenceDoc = collection(
- 'artifact_reference', main_doc_session,
+ b'artifact_reference', main_doc_session,
Field('_id', str),
Field('artifact_reference', dict(
cls=S.Binary(),
@@ -57,7 +57,7 @@ ArtifactReferenceDoc = collection(
)
ShortlinkDoc = collection(
- 'shortlink', main_doc_session,
+ b'shortlink', main_doc_session,
Field('_id', S.ObjectId()),
# index needed for from_artifact() and index_tasks.py:del_artifacts
Field('ref_id', str, index=True),
http://git-wip-us.apache.org/repos/asf/allura/blob/9b6e0b5a/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 4287a18..a34c065 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -911,7 +911,7 @@ class MergeRequest(VersionedArtifact, ActivityObject):
# One of these for each commit in the physical repo on disk. The _id is the
# hexsha of the commit (for Git and Hg).
CommitDoc = collection(
- 'repo_ci', main_doc_session,
+ b'repo_ci', main_doc_session,
Field('_id', str),
Field('tree_id', str),
Field('committed', SUser),
@@ -923,7 +923,7 @@ CommitDoc = collection(
# Basic tree information (also see TreesDoc)
TreeDoc = collection(
- 'repo_tree', main_doc_session,
+ b'repo_tree', main_doc_session,
Field('_id', str),
Field('tree_ids', [dict(name=str, id=str)]),
Field('blob_ids', [dict(name=str, id=str)]),
@@ -931,7 +931,7 @@ TreeDoc = collection(
# Information about the last commit to touch a tree
LastCommitDoc = collection(
- 'repo_last_commit', main_doc_session,
+ b'repo_last_commit', main_doc_session,
Field('_id', S.ObjectId()),
Field('commit_id', str),
Field('path', str),
@@ -944,14 +944,14 @@ LastCommitDoc = collection(
# TreesDoc._id = CommitDoc._id
# TreesDoc.tree_ids = [ TreeDoc._id, ... ]
TreesDoc = collection(
- 'repo_trees', main_doc_session,
+ b'repo_trees', main_doc_session,
Field('_id', str),
Field('tree_ids', [str]))
# List of commit runs (a run is a linear series of single-parent commits)
# CommitRunDoc.commit_ids = [ CommitDoc._id, ... ]
CommitRunDoc = collection(
- 'repo_commitrun', main_doc_session,
+ b'repo_commitrun', main_doc_session,
Field('_id', str),
Field('parent_commit_ids', [str], index=True),
Field('commit_ids', [str], index=True),
[07/14] allura git commit: [#7878] ticket:771 Convert all MappedClass
collection names to bytes
Posted by je...@apache.org.
[#7878] ticket:771 Convert all MappedClass collection names to bytes
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e900dda8
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e900dda8
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e900dda8
Branch: refs/heads/ib/7878
Commit: e900dda81c008d15ceb0bfec92bf4483d13b5e18
Parents: 3640d5f
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue May 19 10:22:24 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue May 19 10:22:24 2015 +0000
----------------------------------------------------------------------
Allura/allura/model/artifact.py | 20 ++++++++++----------
Allura/allura/model/attachments.py | 2 +-
Allura/allura/model/auth.py | 10 +++++-----
Allura/allura/model/discuss.py | 8 ++++----
Allura/allura/model/filesystem.py | 2 +-
Allura/allura/model/monq_model.py | 2 +-
Allura/allura/model/neighborhood.py | 2 +-
Allura/allura/model/notification.py | 6 +++---
Allura/allura/model/oauth.py | 4 ++--
Allura/allura/model/project.py | 8 ++++----
Allura/allura/model/repository.py | 4 ++--
Allura/allura/model/stats.py | 2 +-
Allura/allura/model/webhook.py | 2 +-
Allura/allura/tests/model/test_artifact.py | 2 +-
ForgeBlog/forgeblog/model/blog.py | 6 +++---
ForgeChat/forgechat/model/chat.py | 4 ++--
ForgeDiscussion/forgediscussion/model/forum.py | 8 ++++----
ForgeGit/forgegit/model/git_repo.py | 2 +-
ForgeSVN/forgesvn/model/svn.py | 2 +-
ForgeShortUrl/forgeshorturl/model/shorturl.py | 2 +-
ForgeTracker/forgetracker/model/ticket.py | 10 +++++-----
ForgeUserStats/forgeuserstats/model/stats.py | 2 +-
ForgeWiki/forgewiki/model/wiki.py | 6 +++---
23 files changed, 58 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index f6ba5f0..809db25 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -67,7 +67,7 @@ class Artifact(MappedClass, SearchIndexable):
"""
class __mongometa__:
session = artifact_orm_session
- name = 'artifact'
+ name = b'artifact'
indexes = [
('app_config_id', 'labels'),
]
@@ -418,7 +418,7 @@ class Snapshot(Artifact):
"""A snapshot of an :class:`Artifact <allura.model.artifact.Artifact>`, used in :class:`VersionedArtifact <allura.model.artifact.VersionedArtifact>`"""
class __mongometa__:
session = artifact_orm_session
- name = 'artifact_snapshot'
+ name = b'artifact_snapshot'
unique_indexes = [('artifact_class', 'artifact_id', 'version')]
indexes = [('artifact_id', 'version')]
@@ -476,7 +476,7 @@ class VersionedArtifact(Artifact):
"""
class __mongometa__:
session = artifact_orm_session
- name = 'versioned_artifact'
+ name = b'versioned_artifact'
history_class = Snapshot
version = FieldProperty(S.Int, if_missing=0)
@@ -576,7 +576,7 @@ class Message(Artifact):
class __mongometa__:
session = artifact_orm_session
- name = 'message'
+ name = b'message'
type_s = 'Generic Message'
_id = FieldProperty(str, if_missing=h.gen_message_id)
@@ -624,7 +624,7 @@ class AwardFile(File):
class __mongometa__:
session = main_orm_session
- name = 'award_file'
+ name = b'award_file'
award_id = FieldProperty(S.ObjectId)
@@ -632,7 +632,7 @@ class Award(Artifact):
class __mongometa__:
session = main_orm_session
- name = 'award'
+ name = b'award'
indexes = ['short']
type_s = 'Generic Award'
@@ -676,7 +676,7 @@ class AwardGrant(Artifact):
"An :class:`Award <allura.model.artifact.Award>` can be bestowed upon a project by a neighborhood"
class __mongometa__:
session = main_orm_session
- name = 'grant'
+ name = b'grant'
indexes = ['short']
type_s = 'Generic Award Grant'
@@ -750,7 +750,7 @@ class Feed(MappedClass):
"""
class __mongometa__:
session = project_orm_session
- name = 'artifact_feed'
+ name = b'artifact_feed'
indexes = [
'pubdate',
('artifact_ref.project_id', 'artifact_ref.mount_point'),
@@ -869,7 +869,7 @@ class VotableArtifact(MappedClass):
class __mongometa__:
session = main_orm_session
- name = 'vote'
+ name = b'vote'
votes = FieldProperty(int, if_missing=0)
votes_up = FieldProperty(int, if_missing=0)
@@ -943,7 +943,7 @@ class MovedArtifact(Artifact):
class __mongometa__:
session = artifact_orm_session
- name = 'moved_artifact'
+ name = b'moved_artifact'
_id = FieldProperty(S.ObjectId)
app_config_id = ForeignIdProperty(
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/attachments.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/attachments.py b/Allura/allura/model/attachments.py
index d6af2b2..f96a71a 100644
--- a/Allura/allura/model/attachments.py
+++ b/Allura/allura/model/attachments.py
@@ -34,7 +34,7 @@ class BaseAttachment(File):
ArtifactType = None
class __mongometa__:
- name = 'attachment'
+ name = b'attachment'
polymorphic_on = 'attachment_type'
polymorphic_identity = None
session = project_orm_session
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
index 99b4525..71a7bf1 100644
--- a/Allura/allura/model/auth.py
+++ b/Allura/allura/model/auth.py
@@ -116,7 +116,7 @@ class EmailAddress(MappedClass):
re_format = re.compile('^.*\s+<(.*)>\s*$')
class __mongometa__:
- name = 'email_address'
+ name = b'email_address'
session = main_orm_session
indexes = ['nonce', ]
unique_indexes = [('email', 'claimed_by_user_id'), ]
@@ -223,7 +223,7 @@ please visit the following URL:
class AuthGlobals(MappedClass):
class __mongometa__:
- name = 'auth_globals'
+ name = b'auth_globals'
session = main_orm_session
_id = FieldProperty(int)
@@ -272,7 +272,7 @@ class User(MappedClass, ActivityNode, ActivityObject, SearchIndexable):
SALT_LEN = 8
class __mongometa__:
- name = 'user'
+ name = b'user'
session = main_orm_session
indexes = ['tool_data.sfx.userid', 'tool_data.AuthPasswordReset.hash']
unique_indexes = ['username']
@@ -816,7 +816,7 @@ class User(MappedClass, ActivityNode, ActivityObject, SearchIndexable):
class OldProjectRole(MappedClass):
class __mongometa__:
session = project_orm_session
- name = 'user'
+ name = b'user'
unique_indexes = [('user_id', 'project_id', 'name')]
@@ -833,7 +833,7 @@ class ProjectRole(MappedClass):
class __mongometa__:
session = main_orm_session
- name = 'project_role'
+ name = b'project_role'
unique_indexes = [('user_id', 'project_id', 'name')]
indexes = [
('user_id',),
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 3d12d21..abce767 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -51,7 +51,7 @@ log = logging.getLogger(__name__)
class Discussion(Artifact, ActivityObject):
class __mongometa__:
- name = 'discussion'
+ name = b'discussion'
type_s = 'Discussion'
parent_id = FieldProperty(schema.Deprecated)
@@ -140,7 +140,7 @@ class Discussion(Artifact, ActivityObject):
class Thread(Artifact, ActivityObject):
class __mongometa__:
- name = 'thread'
+ name = b'thread'
indexes = [
('artifact_id',),
('ref_id',),
@@ -433,7 +433,7 @@ class Thread(Artifact, ActivityObject):
class PostHistory(Snapshot):
class __mongometa__:
- name = 'post_history'
+ name = b'post_history'
artifact_id = ForeignIdProperty('Post')
@@ -468,7 +468,7 @@ class PostHistory(Snapshot):
class Post(Message, VersionedArtifact, ActivityObject):
class __mongometa__:
- name = 'post'
+ name = b'post'
history_class = PostHistory
indexes = [
# used in general lookups, last_post, etc
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/filesystem.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/filesystem.py b/Allura/allura/model/filesystem.py
index 25cc698..a860aae 100644
--- a/Allura/allura/model/filesystem.py
+++ b/Allura/allura/model/filesystem.py
@@ -48,7 +48,7 @@ class File(MappedClass):
class __mongometa__:
session = project_orm_session
- name = 'fs'
+ name = b'fs'
indexes = ['filename']
_id = FieldProperty(schema.ObjectId)
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/monq_model.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/monq_model.py b/Allura/allura/model/monq_model.py
index 4aa49c1..9b478bf 100644
--- a/Allura/allura/model/monq_model.py
+++ b/Allura/allura/model/monq_model.py
@@ -68,7 +68,7 @@ class MonQTask(MappedClass):
class __mongometa__:
session = task_orm_session
- name = 'monq_task'
+ name = b'monq_task'
indexes = [
[
# used in MonQTask.get() method
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/neighborhood.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/neighborhood.py b/Allura/allura/model/neighborhood.py
index ae739f5..7335f41 100644
--- a/Allura/allura/model/neighborhood.py
+++ b/Allura/allura/model/neighborhood.py
@@ -67,7 +67,7 @@ class Neighborhood(MappedClass):
'''
class __mongometa__:
session = main_orm_session
- name = 'neighborhood'
+ name = b'neighborhood'
unique_indexes = ['url_prefix']
_id = FieldProperty(S.ObjectId)
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/notification.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/notification.py b/Allura/allura/model/notification.py
index f8bf870..aed6a65 100644
--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -76,7 +76,7 @@ class Notification(MappedClass):
class __mongometa__:
session = main_orm_session
- name = 'notification'
+ name = b'notification'
indexes = ['project_id']
_id = FieldProperty(str, if_missing=h.gen_message_id)
@@ -386,7 +386,7 @@ class Mailbox(MappedClass):
class __mongometa__:
session = main_orm_session
- name = 'mailbox'
+ name = b'mailbox'
unique_indexes = [
('user_id', 'project_id', 'app_config_id',
'artifact_index_id', 'topic', 'is_flash'),
@@ -705,7 +705,7 @@ class SiteNotification(MappedClass):
class __mongometa__:
session = main_orm_session
- name = 'site_notification'
+ name = b'site_notification'
_id = FieldProperty(S.ObjectId)
content = FieldProperty(str, if_missing='')
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/oauth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/oauth.py b/Allura/allura/model/oauth.py
index 1e0953b..7c27366 100644
--- a/Allura/allura/model/oauth.py
+++ b/Allura/allura/model/oauth.py
@@ -44,7 +44,7 @@ class OAuthToken(MappedClass):
class __mongometa__:
session = main_orm_session
- name = 'oauth_token'
+ name = b'oauth_token'
indexes = ['api_key']
polymorphic_on = 'type'
polymorphic_identity = None
@@ -65,7 +65,7 @@ class OAuthConsumerToken(OAuthToken):
class __mongometa__:
polymorphic_identity = 'consumer'
- name = 'oauth_consumer_token'
+ name = b'oauth_consumer_token'
unique_indexes = [('name', 'user_id')]
type = FieldProperty(str, if_missing='consumer')
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index 2f113b4..df80a85 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -81,7 +81,7 @@ class ProjectCategory(MappedClass):
class __mongometa__:
session = main_orm_session
- name = 'project_category'
+ name = b'project_category'
_id = FieldProperty(S.ObjectId)
parent_id = FieldProperty(S.ObjectId, if_missing=None)
@@ -114,7 +114,7 @@ class TroveCategory(MappedClass):
class __mongometa__:
session = main_orm_session
- name = 'trove_category'
+ name = b'trove_category'
extensions = [TroveCategoryMapperExtension]
indexes = ['trove_cat_id', 'trove_parent_id', 'shortname', 'fullpath']
@@ -190,7 +190,7 @@ class Project(SearchIndexable, MappedClass, ActivityNode, ActivityObject):
class __mongometa__:
session = main_orm_session
- name = 'project'
+ name = b'project'
indexes = [
'name',
'neighborhood_id',
@@ -1214,7 +1214,7 @@ class AppConfig(MappedClass, ActivityObject):
class __mongometa__:
session = project_orm_session
- name = 'config'
+ name = b'config'
indexes = [
'project_id',
'options.import_id',
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index d720377..4287a18 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -330,7 +330,7 @@ class Repository(Artifact, ActivityObject):
BATCH_SIZE = 100
class __mongometa__:
- name = 'generic-repository'
+ name = b'generic-repository'
indexes = ['upstream_repo.name']
_impl = None
repo_id = 'repo'
@@ -722,7 +722,7 @@ class MergeRequest(VersionedArtifact, ActivityObject):
statuses = ['open', 'merged', 'rejected']
class __mongometa__:
- name = 'merge-request'
+ name = b'merge-request'
indexes = ['commit_id']
unique_indexes = [('app_config_id', 'request_number')]
type_s = 'MergeRequest'
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/stats.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/stats.py b/Allura/allura/model/stats.py
index 1668f45..8eb6ab4 100644
--- a/Allura/allura/model/stats.py
+++ b/Allura/allura/model/stats.py
@@ -37,7 +37,7 @@ from functools import reduce
class Stats(MappedClass):
class __mongometa__:
- name = 'basestats'
+ name = b'basestats'
session = main_orm_session
unique_indexes = ['_id']
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/model/webhook.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/webhook.py b/Allura/allura/model/webhook.py
index 6104a03..900181d 100644
--- a/Allura/allura/model/webhook.py
+++ b/Allura/allura/model/webhook.py
@@ -32,7 +32,7 @@ from allura.lib import helpers as h
class Webhook(Artifact):
class __mongometa__:
- name = 'webhook'
+ name = b'webhook'
unique_indexes = [('app_config_id', 'type', 'hook_url')]
type = FieldProperty(str)
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/Allura/allura/tests/model/test_artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_artifact.py b/Allura/allura/tests/model/test_artifact.py
index fb6ee43..09313c1 100644
--- a/Allura/allura/tests/model/test_artifact.py
+++ b/Allura/allura/tests/model/test_artifact.py
@@ -49,7 +49,7 @@ from forgewiki import model as WM
class Checkmessage(M.Message):
class __mongometa__:
- name = 'checkmessage'
+ name = b'checkmessage'
def url(self):
return ''
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/ForgeBlog/forgeblog/model/blog.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index 7dc68e6..71f78e4 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -45,7 +45,7 @@ config = utils.ConfigProxy(
class Globals(MappedClass):
class __mongometa__:
- name = 'blog-globals'
+ name = b'blog-globals'
session = M.project_orm_session
indexes = ['app_config_id']
@@ -59,7 +59,7 @@ class Globals(MappedClass):
class BlogPostSnapshot(M.Snapshot):
class __mongometa__:
- name = 'blog_post_snapshot'
+ name = b'blog_post_snapshot'
type_s = 'Blog Post Snapshot'
def original(self):
@@ -104,7 +104,7 @@ class BlogPostSnapshot(M.Snapshot):
class BlogPost(M.VersionedArtifact, ActivityObject):
class __mongometa__:
- name = 'blog_post'
+ name = b'blog_post'
history_class = BlogPostSnapshot
unique_indexes = [('app_config_id', 'slug')]
indexes = [
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/ForgeChat/forgechat/model/chat.py
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/model/chat.py b/ForgeChat/forgechat/model/chat.py
index 03466b5..ef33583 100644
--- a/ForgeChat/forgechat/model/chat.py
+++ b/ForgeChat/forgechat/model/chat.py
@@ -32,7 +32,7 @@ from allura.model.types import MarkdownCache
class ChatChannel(MappedClass):
class __mongometa__:
- name = 'globals'
+ name = b'globals'
session = M.main_orm_session
indexes = ['project_id']
unique_indexes = ['channel']
@@ -46,7 +46,7 @@ class ChatChannel(MappedClass):
class ChatMessage(M.Artifact):
class __mongometa__:
- name = 'chat_message'
+ name = b'chat_message'
indexes = ['timestamp']
type_s = 'Chat Message'
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/ForgeDiscussion/forgediscussion/model/forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/model/forum.py b/ForgeDiscussion/forgediscussion/model/forum.py
index e6bbd4e..73ffa57 100644
--- a/ForgeDiscussion/forgediscussion/model/forum.py
+++ b/ForgeDiscussion/forgediscussion/model/forum.py
@@ -45,7 +45,7 @@ log = logging.getLogger(__name__)
class Forum(M.Discussion):
class __mongometa__:
- name = 'forum'
+ name = b'forum'
type_s = 'Discussion'
parent_id = FieldProperty(schema.ObjectId, if_missing=None)
@@ -161,7 +161,7 @@ class ForumFile(M.File):
class ForumThread(M.Thread):
class __mongometa__:
- name = 'forum_thread'
+ name = b'forum_thread'
indexes = [
'flags',
'discussion_id',
@@ -217,7 +217,7 @@ class ForumThread(M.Thread):
class ForumPostHistory(M.PostHistory):
class __mongometa__:
- name = 'post_history'
+ name = b'post_history'
artifact_id = ForeignIdProperty('ForumPost')
@@ -225,7 +225,7 @@ class ForumPostHistory(M.PostHistory):
class ForumPost(M.Post):
class __mongometa__:
- name = 'forum_post'
+ name = b'forum_post'
history_class = ForumPostHistory
indexes = [
'timestamp', # for the posts_24hr site_stats query
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/ForgeGit/forgegit/model/git_repo.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py
index a0d7bbc..eee7646 100644
--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -65,7 +65,7 @@ class Repository(M.Repository):
type_s = 'Git Repository'
class __mongometa__:
- name = 'git-repository'
+ name = b'git-repository'
@LazyProperty
def _impl(self):
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/ForgeSVN/forgesvn/model/svn.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index 1a032c4..643be54 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -59,7 +59,7 @@ class Repository(M.Repository):
type_s = 'SVN Repository'
class __mongometa__:
- name = 'svn-repository'
+ name = b'svn-repository'
branches = FieldProperty([dict(name=str, object_id=str)])
_refresh_precompute = False
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/ForgeShortUrl/forgeshorturl/model/shorturl.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/model/shorturl.py b/ForgeShortUrl/forgeshorturl/model/shorturl.py
index 9dbde04..e4c8ea6 100644
--- a/ForgeShortUrl/forgeshorturl/model/shorturl.py
+++ b/ForgeShortUrl/forgeshorturl/model/shorturl.py
@@ -31,7 +31,7 @@ from allura import model as M
class ShortUrl(M.Artifact):
class __mongometa__:
- name = 'short_urls'
+ name = b'short_urls'
unique_indexes = [('short_name', 'app_config_id')]
type_s = 'ShortUrl'
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index 8c0e17e..bd8c4ee 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -94,7 +94,7 @@ config = utils.ConfigProxy(
class Globals(MappedClass):
class __mongometa__:
- name = 'globals'
+ name = b'globals'
session = project_orm_session
indexes = ['app_config_id']
@@ -528,7 +528,7 @@ class Globals(MappedClass):
class TicketHistory(Snapshot):
class __mongometa__:
- name = 'ticket_history'
+ name = b'ticket_history'
def original(self):
return Ticket.query.get(_id=self.artifact_id)
@@ -570,7 +570,7 @@ class TicketHistory(Snapshot):
class Bin(Artifact, ActivityObject):
class __mongometa__:
- name = 'bin'
+ name = b'bin'
type_s = 'Bin'
_id = FieldProperty(schema.ObjectId)
@@ -612,7 +612,7 @@ class Bin(Artifact, ActivityObject):
class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
class __mongometa__:
- name = 'ticket'
+ name = b'ticket'
history_class = TicketHistory
indexes = [
'ticket_num',
@@ -1295,7 +1295,7 @@ class MovedTicket(MovedArtifact):
class __mongometa__:
session = artifact_orm_session
- name = 'moved_ticket'
+ name = b'moved_ticket'
indexes = [
('app_config_id', 'ticket_num'),
]
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/ForgeUserStats/forgeuserstats/model/stats.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/model/stats.py b/ForgeUserStats/forgeuserstats/model/stats.py
index a825e4f..84e9dbf 100644
--- a/ForgeUserStats/forgeuserstats/model/stats.py
+++ b/ForgeUserStats/forgeuserstats/model/stats.py
@@ -33,7 +33,7 @@ from allura.model import Stats
class UserStats(Stats):
class __mongometa__:
- name = 'userstats'
+ name = b'userstats'
session = main_orm_session
unique_indexes = ['_id', 'user_id']
http://git-wip-us.apache.org/repos/asf/allura/blob/e900dda8/ForgeWiki/forgewiki/model/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/model/wiki.py b/ForgeWiki/forgewiki/model/wiki.py
index a515db8..7603688 100644
--- a/ForgeWiki/forgewiki/model/wiki.py
+++ b/ForgeWiki/forgewiki/model/wiki.py
@@ -56,7 +56,7 @@ config = utils.ConfigProxy(
class Globals(MappedClass):
class __mongometa__:
- name = 'wiki-globals'
+ name = b'wiki-globals'
session = project_orm_session
indexes = ['app_config_id']
@@ -70,7 +70,7 @@ class Globals(MappedClass):
class PageHistory(Snapshot):
class __mongometa__:
- name = 'page_history'
+ name = b'page_history'
def original(self):
return Page.query.get(_id=self.artifact_id)
@@ -106,7 +106,7 @@ class PageHistory(Snapshot):
class Page(VersionedArtifact, ActivityObject):
class __mongometa__:
- name = 'page'
+ name = b'page'
history_class = PageHistory
unique_indexes = [('app_config_id', 'title')]
[12/14] allura git commit: [#7878] ticket:771 Convert args in test
app to plain string
Posted by je...@apache.org.
[#7878] ticket:771 Convert args in test app to plain string
WebTest==1.4.0 which we are using does not handle unicode well. For example
methods to send GET/POST/etc request raise exception if url is unicode or some
of the parameters are.
Seems like newer versions (2.0.18) supports it better, but we can't use it,
because it depends on WebOb>=1.2 which conflicts with TurboGears which depends
on WebOb==1.0.8. That is why manual fix for now.
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/785c254f
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/785c254f
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/785c254f
Branch: refs/heads/ib/7878
Commit: 785c254fcd475e7ed78e00a34cc3adfec7d270a6
Parents: 9b1623e
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue May 19 11:38:18 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue May 19 11:38:18 2015 +0000
----------------------------------------------------------------------
AlluraTest/alluratest/validation.py | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/785c254f/AlluraTest/alluratest/validation.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/validation.py b/AlluraTest/alluratest/validation.py
index bd55608..5696df7 100644
--- a/AlluraTest/alluratest/validation.py
+++ b/AlluraTest/alluratest/validation.py
@@ -306,7 +306,26 @@ class ValidatingTestApp(PostParamCheckingTestApp):
params[k] = kw.pop(k, False)
return params, kw
+ def convert_dict(self, d):
+ return {str(k): str(v) for k, v in d.iteritems()}
+
+ def convert_args(self, args, kw):
+ """
+ Convert args to plain string, because webtest.TestApp.get/post/etc does
+ not work with unicode.
+ """
+ url = str(args[0])
+ args = (url,) + args[1:]
+ params = kw.pop('params', None)
+ extra_environ = kw.pop('extra_environ', None)
+ if params:
+ kw['params'] = self.convert_dict(params)
+ if extra_environ:
+ kw['extra_environ'] = self.convert_dict(extra_environ)
+ return args, kw
+
def get(self, *args, **kw):
+ args, kw = self.convert_args(args, kw)
val_params, kw = self._get_validation_params(kw)
resp = super(ValidatingTestApp, self).get(*args, **kw)
if not self.validate_skip and not val_params['validate_skip']:
@@ -314,6 +333,7 @@ class ValidatingTestApp(PostParamCheckingTestApp):
return resp
def post(self, *args, **kw):
+ args, kw = self.convert_args(args, kw)
val_params, kw = self._get_validation_params(kw)
resp = super(ValidatingTestApp, self).post(*args, **kw)
if not self.validate_skip and not val_params['validate_skip']:
@@ -321,6 +341,7 @@ class ValidatingTestApp(PostParamCheckingTestApp):
return resp
def delete(self, *args, **kw):
+ args, kw = self.convert_args(args, kw)
val_params, kw = self._get_validation_params(kw)
resp = super(ValidatingTestApp, self).delete(*args, **kw)
if not self.validate_skip and not val_params['validate_skip']:
[03/14] allura git commit: [#7878] ticket:771 Add __future__ imports
Posted by je...@apache.org.
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index 9c5397f..dd9616f 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import mock
import random
import logging
@@ -206,9 +210,8 @@ class TestForumAsync(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params['subject'] = 'New Subject'
params['text'] = 'Asdf'
r = self.app.post(url, params=params)
@@ -218,9 +221,8 @@ class TestForumAsync(TestController):
params = dict()
inputs = post_form.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[post_form.find('textarea')['name']] = 'text'
r = self.app.post(url + 'reply', params=params)
self._post('testforum', 'Test Reply', 'Nothing here, either',
@@ -369,9 +371,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = '1st post in Zero Posts thread'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'Test Zero Posts'
@@ -413,8 +414,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'This is a *test thread*'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'Test Thread'
@@ -437,8 +438,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'Post text'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = "this is <h2> o'clock"
@@ -471,8 +472,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'Post content'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'Test Thread'
@@ -508,8 +509,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'aaa'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'AAA'
@@ -522,8 +523,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'bbb'
thread = self.app.post(str(rep_url), params=params)
thread = self.app.get(url)
@@ -544,8 +545,8 @@ class TestForum(TestController):
params = dict()
inputs = reply_form.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[reply_form.find('textarea')['name']] = 'zzz'
self.app.post(post_link, params)
r = self.app.get(thread_url)
@@ -559,8 +560,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'Post text'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'Post subject'
@@ -573,8 +574,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name') and 'subscription' not in field['name']:
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field and 'subscription' not in field['name']:
+ params[field['name']] = 'value' in field and field['value'] or ''
self.app.post(str(subscribe_url), params=params)
self.app.get('/discussion/general/subscribe_to_forum?subscribe=True')
f = thread.html.find('div', {'class': 'row reply_post_form'}).find('form')
@@ -582,8 +583,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'Reply 2'
self.app.post(str(rep_url), params=params)
assert M.Notification.query.find(
@@ -607,8 +608,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'aaa aaa'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'AAAA'
@@ -660,8 +661,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'aaa aaa'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'topic1'
@@ -674,8 +675,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'aaa aaa'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'topic2'
@@ -725,8 +726,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'aaa aaa'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'topic1'
@@ -740,8 +741,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'bbb'
thread = self.app.post(str(rep_url), params=params)
thread = self.app.get(url)
@@ -773,8 +774,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'aaa'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'AAA'
@@ -797,8 +798,8 @@ class TestForum(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'aaa'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'AAA'
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
index 0eb4168..c6c519b 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -185,9 +189,8 @@ class TestForumAdmin(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'secret text'
params[f.find('select')['name']] = 'secret'
params[f.find('input', {'style': 'width: 90%'})
@@ -240,9 +243,8 @@ class TestForumAdmin(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'post text'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'post topic'
@@ -266,9 +268,8 @@ class TestForumAdmin(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'post text'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'post topic'
@@ -296,9 +297,8 @@ class TestForumAdmin(TestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'post text'
params[f.find('select')['name']] = 'testforum'
params[f.find('input', {'style': 'width: 90%'})['name']] = 'post topic'
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/tests/functional/test_import.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_import.py b/ForgeDiscussion/forgediscussion/tests/functional/test_import.py
index 73b0a8f..5c02a3f 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_import.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_import.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
index 1b7d080..fe76ffb 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from nose.tools import assert_equal, assert_in
from allura.lib import helpers as h
@@ -54,9 +58,8 @@ class TestDiscussionApiBase(TestRestApiBase):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key(
- 'value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = text
params[f.find('select')['name']] = forum
params[f.find('input', {'style': 'width: 90%'})['name']] = subject
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/tests/test_app.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/test_app.py b/ForgeDiscussion/forgediscussion/tests/test_app.py
index 76f2071..a77321d 100644
--- a/ForgeDiscussion/forgediscussion/tests/test_app.py
+++ b/ForgeDiscussion/forgediscussion/tests/test_app.py
@@ -19,6 +19,10 @@
#-*- python -*-
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import tempfile
import json
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py b/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
index 44d6989..e991768 100644
--- a/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
+++ b/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/utils.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/utils.py b/ForgeDiscussion/forgediscussion/utils.py
index d9128d9..adc90d6 100644
--- a/ForgeDiscussion/forgediscussion/utils.py
+++ b/ForgeDiscussion/forgediscussion/utils.py
@@ -16,6 +16,10 @@
# under the License.
""" ForgeDiscussion utilities. """
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from bson import ObjectId
from tg import flash
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/version.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/version.py b/ForgeDiscussion/forgediscussion/version.py
index 1b493f8..8f5910c 100644
--- a/ForgeDiscussion/forgediscussion/version.py
+++ b/ForgeDiscussion/forgediscussion/version.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/widgets/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/widgets/__init__.py b/ForgeDiscussion/forgediscussion/widgets/__init__.py
index f733ddb..595a628 100644
--- a/ForgeDiscussion/forgediscussion/widgets/__init__.py
+++ b/ForgeDiscussion/forgediscussion/widgets/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,6 +19,6 @@
# specific language governing permissions and limitations
# under the License.
-from forum_widgets import ForumSubscriptionForm, ThreadSubscriptionForm, AnnouncementsTable
-from forum_widgets import ModerateThread, ForumHeader, ThreadHeader
-from forum_widgets import Post, Thread, Forum
+from .forum_widgets import ForumSubscriptionForm, ThreadSubscriptionForm, AnnouncementsTable
+from .forum_widgets import ModerateThread, ForumHeader, ThreadHeader
+from .forum_widgets import Post, Thread, Forum
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/widgets/admin.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/widgets/admin.py b/ForgeDiscussion/forgediscussion/widgets/admin.py
index 696f155..581149d 100644
--- a/ForgeDiscussion/forgediscussion/widgets/admin.py
+++ b/ForgeDiscussion/forgediscussion/widgets/admin.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py b/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
index d26f330..8f7ca83 100644
--- a/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
+++ b/ForgeDiscussion/forgediscussion/widgets/forum_widgets.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeDiscussion/setup.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/setup.py b/ForgeDiscussion/setup.py
index 165ce4b..93faf76 100644
--- a/ForgeDiscussion/setup.py
+++ b/ForgeDiscussion/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/forgegit/controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/controllers.py b/ForgeGit/forgegit/controllers.py
index 93e9364..2247772 100644
--- a/ForgeGit/forgegit/controllers.py
+++ b/ForgeGit/forgegit/controllers.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/forgegit/git_main.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/git_main.py b/ForgeGit/forgegit/git_main.py
index 62fc0f7..0a2f32b 100644
--- a/ForgeGit/forgegit/git_main.py
+++ b/ForgeGit/forgegit/git_main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/forgegit/model/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/model/__init__.py b/ForgeGit/forgegit/model/__init__.py
index 72eb80a..2c9c606 100644
--- a/ForgeGit/forgegit/model/__init__.py
+++ b/ForgeGit/forgegit/model/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,4 +19,4 @@
# specific language governing permissions and limitations
# under the License.
-from git_repo import Repository
+from .git_repo import Repository
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/forgegit/model/git_repo.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py
index 3b3b9e9..a0d7bbc 100644
--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -160,7 +164,7 @@ class GitImplementation(M.RepositoryImplementation):
_git = git.Repo(self._repo.full_fs_path, odbt=git.GitCmdObjectDB)
_git.git = GitLibCmdWrapper(_git.git)
return _git
- except (git.exc.NoSuchPathError, git.exc.InvalidGitRepositoryError), err:
+ except (git.exc.NoSuchPathError, git.exc.InvalidGitRepositoryError) as err:
log.error('Problem looking up repo: %r', err)
return None
@@ -474,7 +478,7 @@ class GitImplementation(M.RepositoryImplementation):
'hooks', 'post-receive')
with open(fn, 'w') as fp:
fp.write(text)
- os.chmod(fn, 0755)
+ os.chmod(fn, 0o755)
def _object(self, oid):
evens = oid[::2]
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/forgegit/tests/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/__init__.py b/ForgeGit/forgegit/tests/__init__.py
index b693039..3e7d4a9 100644
--- a/ForgeGit/forgegit/tests/__init__.py
+++ b/ForgeGit/forgegit/tests/__init__.py
@@ -19,6 +19,10 @@
# Make our own Git tool test decorator
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from allura.tests.decorators import with_tool
with_git = with_tool('test', 'Git', 'src-git', 'Git', type='git')
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/forgegit/tests/functional/test_auth.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_auth.py b/ForgeGit/forgegit/tests/functional/test_auth.py
index 1a230d4..bbd7380 100644
--- a/ForgeGit/forgegit/tests/functional/test_auth.py
+++ b/ForgeGit/forgegit/tests/functional/test_auth.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import json
from datadiff.tools import assert_equal
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 7458ba8..cad90a7 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -474,9 +478,9 @@ class TestFork(_TestCase):
def _follow(self, r, **kw):
if r.status_int == 302:
- print r.request.url
+ print(r.request.url)
while r.status_int == 302:
- print ' ==> 302 ==> %s' % r.location
+ print(' ==> 302 ==> %s' % r.location)
r = r.follow(**kw)
return r
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/forgegit/tests/model/test_repository.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/model/test_repository.py b/ForgeGit/forgegit/tests/model/test_repository.py
index dbc12b0..73aa315 100644
--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import shutil
import stat
@@ -781,7 +785,7 @@ class TestGitCommit(unittest.TestCase):
+ self.rev.diffs.changed
+ self.rev.diffs.copied)
for d in diffs:
- print d
+ print(d)
def test_log(self):
# path only
@@ -883,5 +887,5 @@ class TestGitRename(unittest.TestCase):
def test_merge_commit(self):
merge_sha = '13951944969cf45a701bf90f83647b309815e6d5'
- commit = self.repo.log(revs=merge_sha, id_only=False).next()
+ commit = next(self.repo.log(revs=merge_sha, id_only=False))
self.assertEqual(commit['rename_details'], {})
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/forgegit/tests/test_git_app.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/test_git_app.py b/ForgeGit/forgegit/tests/test_git_app.py
index 0566249..501ec29 100644
--- a/ForgeGit/forgegit/tests/test_git_app.py
+++ b/ForgeGit/forgegit/tests/test_git_app.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/forgegit/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/test_tasks.py b/ForgeGit/forgegit/tests/test_tasks.py
index 3f003d6..16d9db1 100644
--- a/ForgeGit/forgegit/tests/test_tasks.py
+++ b/ForgeGit/forgegit/tests/test_tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/forgegit/version.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/version.py b/ForgeGit/forgegit/version.py
index 1b493f8..8f5910c 100644
--- a/ForgeGit/forgegit/version.py
+++ b/ForgeGit/forgegit/version.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeGit/setup.py
----------------------------------------------------------------------
diff --git a/ForgeGit/setup.py b/ForgeGit/setup.py
index e91068b..19c3bb4 100644
--- a/ForgeGit/setup.py
+++ b/ForgeGit/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/docs/conf.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/docs/conf.py b/ForgeImporters/docs/conf.py
index 7783282..6c8947c 100644
--- a/ForgeImporters/docs/conf.py
+++ b/ForgeImporters/docs/conf.py
@@ -37,6 +37,10 @@
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.ifconfig']
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index 8428142..71b61cc 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/forge/tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/forge/tracker.py b/ForgeImporters/forgeimporters/forge/tracker.py
index 2937b63..1cda5c8 100644
--- a/ForgeImporters/forgeimporters/forge/tracker.py
+++ b/ForgeImporters/forgeimporters/forge/tracker.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/__init__.py b/ForgeImporters/forgeimporters/github/__init__.py
index fe501dd..aec412a 100644
--- a/ForgeImporters/forgeimporters/github/__init__.py
+++ b/ForgeImporters/forgeimporters/github/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/code.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/code.py b/ForgeImporters/forgeimporters/github/code.py
index 410b3bb..d7707db 100644
--- a/ForgeImporters/forgeimporters/github/code.py
+++ b/ForgeImporters/forgeimporters/github/code.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/project.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/project.py b/ForgeImporters/forgeimporters/github/project.py
index c4d8c61..56e8b93 100644
--- a/ForgeImporters/forgeimporters/github/project.py
+++ b/ForgeImporters/forgeimporters/github/project.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/tasks.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tasks.py b/ForgeImporters/forgeimporters/github/tasks.py
index d74a9cd..eb584de 100644
--- a/ForgeImporters/forgeimporters/github/tasks.py
+++ b/ForgeImporters/forgeimporters/github/tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/tests/test_code.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tests/test_code.py b/ForgeImporters/forgeimporters/github/tests/test_code.py
index e247a5f..03df7f1 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_code.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_code.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/tests/test_oauth.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tests/test_oauth.py b/ForgeImporters/forgeimporters/github/tests/test_oauth.py
index 584b403..1d40c51 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_oauth.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_oauth.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/tests/test_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tests/test_tracker.py b/ForgeImporters/forgeimporters/github/tests/test_tracker.py
index ba09ece..81b3090 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_tracker.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_tracker.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/tests/test_utils.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tests/test_utils.py b/ForgeImporters/forgeimporters/github/tests/test_utils.py
index 6ce7821..a4268ee 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_utils.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_utils.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/tests/test_wiki.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tests/test_wiki.py b/ForgeImporters/forgeimporters/github/tests/test_wiki.py
index 6523de6..b704220 100644
--- a/ForgeImporters/forgeimporters/github/tests/test_wiki.py
+++ b/ForgeImporters/forgeimporters/github/tests/test_wiki.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from unittest import TestCase
from nose.tools import assert_equal
from mock import Mock, patch, call
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tracker.py b/ForgeImporters/forgeimporters/github/tracker.py
index cbc017d..6d94085 100644
--- a/ForgeImporters/forgeimporters/github/tracker.py
+++ b/ForgeImporters/forgeimporters/github/tracker.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/utils.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/utils.py b/ForgeImporters/forgeimporters/github/utils.py
index 3f00310..9f6a869 100644
--- a/ForgeImporters/forgeimporters/github/utils.py
+++ b/ForgeImporters/forgeimporters/github/utils.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/github/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/wiki.py b/ForgeImporters/forgeimporters/github/wiki.py
index 5b787d9..1080ad3 100644
--- a/ForgeImporters/forgeimporters/github/wiki.py
+++ b/ForgeImporters/forgeimporters/github/wiki.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/google/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/__init__.py b/ForgeImporters/forgeimporters/google/__init__.py
index 302544e..deaa3ab 100644
--- a/ForgeImporters/forgeimporters/google/__init__.py
+++ b/ForgeImporters/forgeimporters/google/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/google/code.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/code.py b/ForgeImporters/forgeimporters/google/code.py
index 6a3f43c..4a2b7ad 100644
--- a/ForgeImporters/forgeimporters/google/code.py
+++ b/ForgeImporters/forgeimporters/google/code.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/google/project.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/project.py b/ForgeImporters/forgeimporters/google/project.py
index 9ffade1..5003531 100644
--- a/ForgeImporters/forgeimporters/google/project.py
+++ b/ForgeImporters/forgeimporters/google/project.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/google/tasks.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/tasks.py b/ForgeImporters/forgeimporters/google/tasks.py
index b0cb76f..f6727d8 100644
--- a/ForgeImporters/forgeimporters/google/tasks.py
+++ b/ForgeImporters/forgeimporters/google/tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/google/tests/test_code.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/tests/test_code.py b/ForgeImporters/forgeimporters/google/tests/test_code.py
index 1b6cacc..a6079c1 100644
--- a/ForgeImporters/forgeimporters/google/tests/test_code.py
+++ b/ForgeImporters/forgeimporters/google/tests/test_code.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/google/tests/test_init.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/tests/test_init.py b/ForgeImporters/forgeimporters/google/tests/test_init.py
index 37bf4c2..d81f58a 100644
--- a/ForgeImporters/forgeimporters/google/tests/test_init.py
+++ b/ForgeImporters/forgeimporters/google/tests/test_init.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/google/tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/google/tracker.py b/ForgeImporters/forgeimporters/google/tracker.py
index 7873aa6..b882c37 100644
--- a/ForgeImporters/forgeimporters/google/tracker.py
+++ b/ForgeImporters/forgeimporters/google/tracker.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/tests/forge/test_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/forge/test_tracker.py b/ForgeImporters/forgeimporters/tests/forge/test_tracker.py
index e985763..e416692 100644
--- a/ForgeImporters/forgeimporters/tests/forge/test_tracker.py
+++ b/ForgeImporters/forgeimporters/tests/forge/test_tracker.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/tests/github/functional/test_github.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/github/functional/test_github.py b/ForgeImporters/forgeimporters/tests/github/functional/test_github.py
index 6577e4d..ac3f8ba 100644
--- a/ForgeImporters/forgeimporters/tests/github/functional/test_github.py
+++ b/ForgeImporters/forgeimporters/tests/github/functional/test_github.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/tests/github/test_extractor.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/github/test_extractor.py b/ForgeImporters/forgeimporters/tests/github/test_extractor.py
index d91c25b..8f5c50f 100644
--- a/ForgeImporters/forgeimporters/tests/github/test_extractor.py
+++ b/ForgeImporters/forgeimporters/tests/github/test_extractor.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/tests/github/test_tasks.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/github/test_tasks.py b/ForgeImporters/forgeimporters/tests/github/test_tasks.py
index cf58644..3ee3856 100644
--- a/ForgeImporters/forgeimporters/tests/github/test_tasks.py
+++ b/ForgeImporters/forgeimporters/tests/github/test_tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/tests/github/test_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/github/test_tracker.py b/ForgeImporters/forgeimporters/tests/github/test_tracker.py
index e02ac5a..6cdc911 100644
--- a/ForgeImporters/forgeimporters/tests/github/test_tracker.py
+++ b/ForgeImporters/forgeimporters/tests/github/test_tracker.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/tests/google/functional/test_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/google/functional/test_tracker.py b/ForgeImporters/forgeimporters/tests/google/functional/test_tracker.py
index 938d1c7..c38d6fd 100644
--- a/ForgeImporters/forgeimporters/tests/google/functional/test_tracker.py
+++ b/ForgeImporters/forgeimporters/tests/google/functional/test_tracker.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/tests/google/test_extractor.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/google/test_extractor.py b/ForgeImporters/forgeimporters/tests/google/test_extractor.py
index fe74f9c..c2c826c 100644
--- a/ForgeImporters/forgeimporters/tests/google/test_extractor.py
+++ b/ForgeImporters/forgeimporters/tests/google/test_extractor.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/tests/google/test_tasks.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/google/test_tasks.py b/ForgeImporters/forgeimporters/tests/google/test_tasks.py
index 01bab68..1668137 100644
--- a/ForgeImporters/forgeimporters/tests/google/test_tasks.py
+++ b/ForgeImporters/forgeimporters/tests/google/test_tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/tests/google/test_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/google/test_tracker.py b/ForgeImporters/forgeimporters/tests/google/test_tracker.py
index e8f12bb..fd2c55a 100644
--- a/ForgeImporters/forgeimporters/tests/google/test_tracker.py
+++ b/ForgeImporters/forgeimporters/tests/google/test_tracker.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/tests/test_base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/test_base.py b/ForgeImporters/forgeimporters/tests/test_base.py
index 22844a0..2b18167 100644
--- a/ForgeImporters/forgeimporters/tests/test_base.py
+++ b/ForgeImporters/forgeimporters/tests/test_base.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/trac/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/trac/__init__.py b/ForgeImporters/forgeimporters/trac/__init__.py
index 12e677a..96b7858 100644
--- a/ForgeImporters/forgeimporters/trac/__init__.py
+++ b/ForgeImporters/forgeimporters/trac/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/trac/project.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/trac/project.py b/ForgeImporters/forgeimporters/trac/project.py
index 0f44259..d62dd61 100644
--- a/ForgeImporters/forgeimporters/trac/project.py
+++ b/ForgeImporters/forgeimporters/trac/project.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/trac/tests/test_tickets.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/trac/tests/test_tickets.py b/ForgeImporters/forgeimporters/trac/tests/test_tickets.py
index e3c8f7e..656992c 100644
--- a/ForgeImporters/forgeimporters/trac/tests/test_tickets.py
+++ b/ForgeImporters/forgeimporters/trac/tests/test_tickets.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/forgeimporters/trac/tickets.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/trac/tickets.py b/ForgeImporters/forgeimporters/trac/tickets.py
index 177652b..9e05d30 100644
--- a/ForgeImporters/forgeimporters/trac/tickets.py
+++ b/ForgeImporters/forgeimporters/trac/tickets.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeImporters/setup.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/setup.py b/ForgeImporters/setup.py
index 4d5f866..e4ac972 100644
--- a/ForgeImporters/setup.py
+++ b/ForgeImporters/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeLink/forgelink/link_main.py
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/link_main.py b/ForgeLink/forgelink/link_main.py
index bfcf9f9..75a78d4 100644
--- a/ForgeLink/forgelink/link_main.py
+++ b/ForgeLink/forgelink/link_main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeLink/forgelink/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/tests/functional/test_rest.py b/ForgeLink/forgelink/tests/functional/test_rest.py
index d7bb7da..94afd1e 100644
--- a/ForgeLink/forgelink/tests/functional/test_rest.py
+++ b/ForgeLink/forgelink/tests/functional/test_rest.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from nose.tools import assert_equal
from allura.tests import decorators as td
from alluratest.controller import TestRestApiBase
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeLink/forgelink/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/tests/functional/test_root.py b/ForgeLink/forgelink/tests/functional/test_root.py
index e4fc656..3cee04d 100644
--- a/ForgeLink/forgelink/tests/functional/test_root.py
+++ b/ForgeLink/forgelink/tests/functional/test_root.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeLink/forgelink/tests/test_app.py
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/tests/test_app.py b/ForgeLink/forgelink/tests/test_app.py
index f4bbe84..98491d2 100644
--- a/ForgeLink/forgelink/tests/test_app.py
+++ b/ForgeLink/forgelink/tests/test_app.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeLink/forgelink/version.py
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/version.py b/ForgeLink/forgelink/version.py
index 1b493f8..8f5910c 100644
--- a/ForgeLink/forgelink/version.py
+++ b/ForgeLink/forgelink/version.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeLink/setup.py
----------------------------------------------------------------------
diff --git a/ForgeLink/setup.py b/ForgeLink/setup.py
index fc91792..7c1991f 100644
--- a/ForgeLink/setup.py
+++ b/ForgeLink/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/controllers.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/controllers.py b/ForgeSVN/forgesvn/controllers.py
index 35af8e7..05b9898 100644
--- a/ForgeSVN/forgesvn/controllers.py
+++ b/ForgeSVN/forgesvn/controllers.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/model/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/model/__init__.py b/ForgeSVN/forgesvn/model/__init__.py
index b19a8c6..2300d9e 100644
--- a/ForgeSVN/forgesvn/model/__init__.py
+++ b/ForgeSVN/forgesvn/model/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,4 +19,4 @@
# specific language governing permissions and limitations
# under the License.
-from svn import Repository
+from .svn import Repository
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/model/svn.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index cd410e3..1a032c4 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -247,7 +251,7 @@ class SVNImplementation(M.RepositoryImplementation):
'hooks', hook_name)
with open(fn, 'wb') as fp:
fp.write('#!/bin/sh\n')
- os.chmod(fn, 0755)
+ os.chmod(fn, 0o755)
def clear_hook(hook_name):
fn = os.path.join(self._repo.fs_path, self._repo.name,
@@ -627,7 +631,7 @@ class SVNImplementation(M.RepositoryImplementation):
'hooks', 'post-commit')
with open(fn, 'wb') as fp:
fp.write(text)
- os.chmod(fn, 0755)
+ os.chmod(fn, 0o755)
def _revno(self, oid):
return int(oid.split(':')[1])
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/svn_main.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/svn_main.py b/ForgeSVN/forgesvn/svn_main.py
index 5dda325..70e306d 100644
--- a/ForgeSVN/forgesvn/svn_main.py
+++ b/ForgeSVN/forgesvn/svn_main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/tests/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/__init__.py b/ForgeSVN/forgesvn/tests/__init__.py
index d152a9e..eaaa26c 100644
--- a/ForgeSVN/forgesvn/tests/__init__.py
+++ b/ForgeSVN/forgesvn/tests/__init__.py
@@ -19,6 +19,10 @@
# Make our own SVN tool test decorator
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from allura.tests.decorators import with_tool
with_svn = with_tool('test', 'SVN', 'src', 'SVN')
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/tests/functional/test_auth.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/functional/test_auth.py b/ForgeSVN/forgesvn/tests/functional/test_auth.py
index 7394c1b..6ca14d6 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_auth.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_auth.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import json
from datadiff.tools import assert_equal
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/functional/test_controllers.py b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
index 6aeca55..5fb3d15 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/tests/model/test_repository.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py
index 6276df8..0028992 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -16,6 +16,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import shutil
import unittest
@@ -358,7 +362,7 @@ class TestSVNRepo(unittest.TestCase, RepoImplTestBase):
assert not self.repo.is_file('/a')
def test_paged_diffs(self):
- entry = self.repo.commit(self.repo.log(2, id_only=True).next())
+ entry = self.repo.commit(next(self.repo.log(2, id_only=True)))
self.assertEqual(entry.diffs, entry.paged_diffs())
self.assertEqual(entry.diffs, entry.paged_diffs(start=0))
added_expected = entry.diffs.added[1:3]
@@ -373,14 +377,14 @@ class TestSVNRepo(unittest.TestCase, RepoImplTestBase):
self.assertEqual(sorted(actual.keys()), sorted(empty.keys()))
def test_diff_create_file(self):
- entry = self.repo.commit(self.repo.log(1, id_only=True).next())
+ entry = self.repo.commit(next(self.repo.log(1, id_only=True)))
self.assertEqual(
entry.diffs, dict(
copied=[], changed=[],
removed=[], added=['/README'], total=1))
def test_diff_create_path(self):
- entry = self.repo.commit(self.repo.log(2, id_only=True).next())
+ entry = self.repo.commit(next(self.repo.log(2, id_only=True)))
actual = entry.diffs
actual.added = sorted(actual.added)
self.assertEqual(
@@ -391,21 +395,21 @@ class TestSVNRepo(unittest.TestCase, RepoImplTestBase):
'/a/b/c/hello.txt']), total=4))
def test_diff_modify_file(self):
- entry = self.repo.commit(self.repo.log(3, id_only=True).next())
+ entry = self.repo.commit(next(self.repo.log(3, id_only=True)))
self.assertEqual(
entry.diffs, dict(
copied=[], changed=['/README'],
removed=[], added=[], total=1))
def test_diff_delete(self):
- entry = self.repo.commit(self.repo.log(4, id_only=True).next())
+ entry = self.repo.commit(next(self.repo.log(4, id_only=True)))
self.assertEqual(
entry.diffs, dict(
copied=[], changed=[],
removed=['/a/b/c/hello.txt'], added=[], total=1))
def test_diff_copy(self):
- entry = self.repo.commit(self.repo.log(5, id_only=True).next())
+ entry = self.repo.commit(next(self.repo.log(5, id_only=True)))
assert_equals(dict(entry.diffs), dict(
copied=[{'new': u'/b', 'old': u'/a', 'diff': '', 'ratio': 1}],
changed=[], removed=[], added=[], total=1))
@@ -658,7 +662,7 @@ class TestSVNRev(unittest.TestCase):
+ self.rev.diffs.changed
+ self.rev.diffs.copied)
for d in diffs:
- print d
+ print(d)
def _oid(self, rev_id):
return '%s:%s' % (self.repo._id, rev_id)
@@ -709,11 +713,11 @@ class _Test(unittest.TestCase):
for k, v in kwargs.iteritems():
if isinstance(v, basestring):
obj = M.repository.Blob(
- t, k, self.idgen.next())
+ t, k, next(self.idgen))
t.blob_ids.append(Object(
name=k, id=obj._id))
else:
- obj = self._make_tree(self.idgen.next(), **v)
+ obj = self._make_tree(next(self.idgen), **v)
t.tree_ids.append(Object(
name=k, id=obj._id))
session(t).flush()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py b/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py
index c4ab72e..543eea4 100644
--- a/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py
+++ b/ForgeSVN/forgesvn/tests/model/test_svnimplementation.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/tests/test_svn_app.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/test_svn_app.py b/ForgeSVN/forgesvn/tests/test_svn_app.py
index 6ea576a..492bea3 100644
--- a/ForgeSVN/forgesvn/tests/test_svn_app.py
+++ b/ForgeSVN/forgesvn/tests/test_svn_app.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/tests/test_tasks.py b/ForgeSVN/forgesvn/tests/test_tasks.py
index 35b426e..6b22570 100644
--- a/ForgeSVN/forgesvn/tests/test_tasks.py
+++ b/ForgeSVN/forgesvn/tests/test_tasks.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import shutil
import unittest
import os
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/version.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/version.py b/ForgeSVN/forgesvn/version.py
index 1b493f8..8f5910c 100644
--- a/ForgeSVN/forgesvn/version.py
+++ b/ForgeSVN/forgesvn/version.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/forgesvn/widgets.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/widgets.py b/ForgeSVN/forgesvn/widgets.py
index c0c880f..eb00048 100644
--- a/ForgeSVN/forgesvn/widgets.py
+++ b/ForgeSVN/forgesvn/widgets.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeSVN/setup.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/setup.py b/ForgeSVN/setup.py
index 40dcf73..8dfe24a 100644
--- a/ForgeSVN/setup.py
+++ b/ForgeSVN/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -25,7 +29,7 @@ from forgesvn.version import __version__
try:
import pysvn
except ImportError:
- print '\npysvn must be installed for ForgeSVN to work\n'
+ print('\npysvn must be installed for ForgeSVN to work\n')
raise
setup(name='ForgeSVN',
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeShortUrl/forgeshorturl/main.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/main.py b/ForgeShortUrl/forgeshorturl/main.py
index b259e92..05a6879 100644
--- a/ForgeShortUrl/forgeshorturl/main.py
+++ b/ForgeShortUrl/forgeshorturl/main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeShortUrl/forgeshorturl/model/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/model/__init__.py b/ForgeShortUrl/forgeshorturl/model/__init__.py
index 34e1ff7..efeccc0 100644
--- a/ForgeShortUrl/forgeshorturl/model/__init__.py
+++ b/ForgeShortUrl/forgeshorturl/model/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeShortUrl/forgeshorturl/model/shorturl.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/model/shorturl.py b/ForgeShortUrl/forgeshorturl/model/shorturl.py
index 6682632..9dbde04 100644
--- a/ForgeShortUrl/forgeshorturl/model/shorturl.py
+++ b/ForgeShortUrl/forgeshorturl/model/shorturl.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeShortUrl/forgeshorturl/tests/functional/test.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/tests/functional/test.py b/ForgeShortUrl/forgeshorturl/tests/functional/test.py
index 0cc8db3..2f92ee5 100644
--- a/ForgeShortUrl/forgeshorturl/tests/functional/test.py
+++ b/ForgeShortUrl/forgeshorturl/tests/functional/test.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeShortUrl/forgeshorturl/widgets/short_url.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/widgets/short_url.py b/ForgeShortUrl/forgeshorturl/widgets/short_url.py
index 0094402..e5c8813 100644
--- a/ForgeShortUrl/forgeshorturl/widgets/short_url.py
+++ b/ForgeShortUrl/forgeshorturl/widgets/short_url.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeShortUrl/setup.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/setup.py b/ForgeShortUrl/setup.py
index 7450912..7e9545d 100644
--- a/ForgeShortUrl/setup.py
+++ b/ForgeShortUrl/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/command/fix_discussion.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/command/fix_discussion.py b/ForgeTracker/forgetracker/command/fix_discussion.py
index 95bddb4..4f89f7c 100644
--- a/ForgeTracker/forgetracker/command/fix_discussion.py
+++ b/ForgeTracker/forgetracker/command/fix_discussion.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
[11/14] allura git commit: [#7878] ticket:771 Convert package_data
keys to bytes in setup.py
Posted by je...@apache.org.
[#7878] ticket:771 Convert package_data keys to bytes in setup.py
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/9b1623e3
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/9b1623e3
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/9b1623e3
Branch: refs/heads/ib/7878
Commit: 9b1623e3248576b44a108fb99643b760394862da
Parents: 4078299
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue May 19 10:50:46 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue May 19 10:50:46 2015 +0000
----------------------------------------------------------------------
Allura/setup.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/9b1623e3/Allura/setup.py
----------------------------------------------------------------------
diff --git a/Allura/setup.py b/Allura/setup.py
index 8e0981b..5c41aa9 100644
--- a/Allura/setup.py
+++ b/Allura/setup.py
@@ -82,12 +82,12 @@ setup(
include_package_data=True,
test_suite='nose.collector',
tests_require=['WebTest >= 1.2', 'BeautifulSoup', 'poster', 'nose'],
- package_data={'allura': ['i18n/*/LC_MESSAGES/*.mo',
- 'templates/**.html',
- 'templates/**.py',
- 'templates/**.xml',
- 'templates/**.txt',
- 'public/*/*/*/*/*',
+ package_data={b'allura': ['i18n/*/LC_MESSAGES/*.mo',
+ 'templates/**.html',
+ 'templates/**.py',
+ 'templates/**.xml',
+ 'templates/**.txt',
+ 'public/*/*/*/*/*',
]},
message_extractors={'allura': [
('**.py', 'python', None),
[09/14] allura git commit: [#7878] ticket:771 Use bytes for function
name in exceptionless decorator
Posted by je...@apache.org.
[#7878] ticket:771 Use bytes for function name in exceptionless decorator
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/9a128174
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/9a128174
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/9a128174
Branch: refs/heads/ib/7878
Commit: 9a1281746d7aeb4f67720627978277c55c8cfab9
Parents: 9b6e0b5
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue May 19 10:31:09 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue May 19 10:31:09 2015 +0000
----------------------------------------------------------------------
Allura/allura/lib/helpers.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/9a128174/Allura/allura/lib/helpers.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index 14eea82..206bc62 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -998,7 +998,7 @@ class exceptionless(object):
self.log = log
def __call__(self, fun):
- fname = 'exceptionless(%s)' % fun.__name__
+ fname = b'exceptionless(%s)' % fun.__name__
def inner(*args, **kwargs):
try:
[02/14] allura git commit: [#7878] ticket:771 Add __future__ imports
Posted by je...@apache.org.
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/config/resources.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/config/resources.py b/ForgeTracker/forgetracker/config/resources.py
index c62d4c4..e836151 100644
--- a/ForgeTracker/forgetracker/config/resources.py
+++ b/ForgeTracker/forgetracker/config/resources.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/import_support.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/import_support.py b/ForgeTracker/forgetracker/import_support.py
index affe94b..d3e000c 100644
--- a/ForgeTracker/forgetracker/import_support.py
+++ b/ForgeTracker/forgetracker/import_support.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -365,7 +369,7 @@ option user_map to avoid losing username information. Unknown users: %s''' % unk
for a_entry in attachments:
try:
self.make_attachment(a['id'], t._id, a_entry)
- except Exception, e:
+ except Exception as e:
self.warnings.append(
'Could not import attachment, skipped: %s' % e)
log.info('Imported ticket: %d', t.ticket_num)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/model/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/__init__.py b/ForgeTracker/forgetracker/model/__init__.py
index 2585be9..5d9a412 100644
--- a/ForgeTracker/forgetracker/model/__init__.py
+++ b/ForgeTracker/forgetracker/model/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,4 +19,4 @@
# specific language governing permissions and limitations
# under the License.
-from ticket import Globals, Bin, Ticket, TicketAttachment, MovedTicket
+from .ticket import Globals, Bin, Ticket, TicketAttachment, MovedTicket
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index 925a067..8c0e17e 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -664,7 +668,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
session(ticket).flush(ticket)
h.log_action(log, 'opened').info('')
return ticket
- except OperationFailure, err:
+ except OperationFailure as err:
if 'duplicate' in err.args[0]:
log.warning('Try to create duplicate ticket %s',
ticket.url())
@@ -804,11 +808,11 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
fld = f
break
if not fld:
- raise KeyError, 'Custom field "%s" does not exist.' % custom_user_field_name
+ raise KeyError('Custom field "%s" does not exist.' % custom_user_field_name)
if fld.type != 'user':
- raise TypeError, 'Custom field "%s" is of type "%s"; expected ' \
+ raise TypeError('Custom field "%s" is of type "%s"; expected ' \
'type "user".' % (
- custom_user_field_name, fld.type)
+ custom_user_field_name, fld.type))
username = self.custom_fields.get(custom_user_field_name)
if not username:
return None
@@ -1059,7 +1063,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
h.log_action(log, 'moved').info('Ticket %s moved to %s' %
(prior_url, new_url))
break
- except OperationFailure, err:
+ except OperationFailure as err:
if 'duplicate' in err.args[0]:
log.warning(
'Try to create duplicate ticket %s when moving from %s' %
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/plugins.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/plugins.py b/ForgeTracker/forgetracker/plugins.py
index c610de8..99b7dba 100644
--- a/ForgeTracker/forgetracker/plugins.py
+++ b/ForgeTracker/forgetracker/plugins.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/search.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/search.py b/ForgeTracker/forgetracker/search.py
index 78181b8..a9738f5 100644
--- a/ForgeTracker/forgetracker/search.py
+++ b/ForgeTracker/forgetracker/search.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/site_stats.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/site_stats.py b/ForgeTracker/forgetracker/site_stats.py
index f9f36ce..71c5be0 100644
--- a/ForgeTracker/forgetracker/site_stats.py
+++ b/ForgeTracker/forgetracker/site_stats.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tasks.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tasks.py b/ForgeTracker/forgetracker/tasks.py
index 0fdebc5..b36b1dd 100644
--- a/ForgeTracker/forgetracker/tasks.py
+++ b/ForgeTracker/forgetracker/tasks.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/command/test_fix_discussion.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/command/test_fix_discussion.py b/ForgeTracker/forgetracker/tests/command/test_fix_discussion.py
index 8560556..9b09842 100644
--- a/ForgeTracker/forgetracker/tests/command/test_fix_discussion.py
+++ b/ForgeTracker/forgetracker/tests/command/test_fix_discussion.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_rest.py b/ForgeTracker/forgetracker/tests/functional/test_rest.py
index aa728e1..a474704 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_rest.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_rest.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 7f67b3a..48cfb24 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -16,6 +16,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from datetime import datetime
import urllib
@@ -850,8 +854,8 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'test comment'
self.app.post(f['action'].encode('utf-8'), params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
@@ -1436,8 +1440,8 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = post_content
r = self.app.post(f['action'].encode('utf-8'), params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
@@ -1452,8 +1456,8 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params['ticket_form.summary'] = new_summary
r = self.app.post(f['action'].encode('utf-8'), params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
@@ -1471,8 +1475,8 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = post_content
r = self.app.post(f['action'].encode('utf-8'), params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
@@ -1499,8 +1503,8 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = post_content
self.app.post(f['action'].encode('utf-8'), params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
@@ -1513,8 +1517,8 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = post_form.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[post_form.find('textarea')['name']] = 'Tis a reply'
r = self.app.post(post_link + 'reply',
params=params,
@@ -2098,8 +2102,8 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = post_content
r = self.app.post(f['action'].encode('utf-8'), params=params,
headers={'Referer': '/p/test2/bugs2/1/'.encode("utf-8")})
@@ -2295,8 +2299,8 @@ class TestFunctionalController(TrackerTestController):
params = dict()
inputs = f.findAll('input')
for field in inputs:
- if field.has_key('name'):
- params[field['name']] = field.has_key('value') and field['value'] or ''
+ if 'name' in field:
+ params[field['name']] = 'value' in field and field['value'] or ''
params[f.find('textarea')['name']] = 'test comment'
self.app.post(f['action'].encode('utf-8'), params=params,
headers={'Referer': '/bugs/1/'.encode("utf-8")})
@@ -2540,7 +2544,7 @@ class TestEmailMonitoring(TrackerTestController):
if (('thread' in f['action']) and ('post' in f['action'])):
params = {i['name']: i.get('value', '')
for i in f.findAll('input')
- if i.has_key('name')}
+ if 'name' in i}
params[f.find('textarea')['name']] = 'foobar'
self.app.post(str(f['action']), params)
break # Do it only once if many forms met
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/test_app.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/test_app.py b/ForgeTracker/forgetracker/tests/test_app.py
index 94d593b..73639af 100644
--- a/ForgeTracker/forgetracker/tests/test_app.py
+++ b/ForgeTracker/forgetracker/tests/test_app.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/test_tracker_roles.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/test_tracker_roles.py b/ForgeTracker/forgetracker/tests/test_tracker_roles.py
index 92bed3f..2d2672b 100644
--- a/ForgeTracker/forgetracker/tests/test_tracker_roles.py
+++ b/ForgeTracker/forgetracker/tests/test_tracker_roles.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/unit/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/__init__.py b/ForgeTracker/forgetracker/tests/unit/__init__.py
index 0a2189a..17c893b 100644
--- a/ForgeTracker/forgetracker/tests/unit/__init__.py
+++ b/ForgeTracker/forgetracker/tests/unit/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_globals_model.py b/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
index e3945dc..d41d74b 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/unit/test_milestone_controller.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_milestone_controller.py b/ForgeTracker/forgetracker/tests/unit/test_milestone_controller.py
index b77cf74..2d5b02d 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_milestone_controller.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_milestone_controller.py
@@ -18,6 +18,10 @@
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from mock import Mock
from nose.tools import assert_equal
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/unit/test_root_controller.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_root_controller.py b/ForgeTracker/forgetracker/tests/unit/test_root_controller.py
index ae2f7a1..8b73a82 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_root_controller.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_root_controller.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/unit/test_search.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_search.py b/ForgeTracker/forgetracker/tests/unit/test_search.py
index e991c28..fd9cb28 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_search.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_search.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py
index 3c8ea70..5b5d3d4 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py
index a0743eb..885669c 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
index aa17c1f..e44e218 100644
--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_model.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 52e7b28..0c64a91 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -1354,7 +1358,7 @@ class TicketController(BaseController, FeedController):
subscribed=subscribed, voting_enabled=voting_enabled,
page=page, limit=limit, count=post_count)
else:
- raise exc.HTTPNotFound, 'Ticket #%s does not exist.' % self.ticket_num
+ raise exc.HTTPNotFound('Ticket #%s does not exist.' % self.ticket_num)
def get_feed(self, project, app, user):
"""Return a :class:`allura.controllers.feed.FeedArgs` object describing
@@ -1648,7 +1652,7 @@ class TrackerAdminController(DefaultAdminController):
@require_post()
def allow_default_field(self, **post_data):
for column in self.app.globals['show_in_search'].keys():
- if post_data.has_key(column) and post_data[column] == 'on':
+ if column in post_data and post_data[column] == 'on':
self.app.globals['show_in_search'][column] = True
else:
self.app.globals['show_in_search'][column] = False
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/version.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/version.py b/ForgeTracker/forgetracker/version.py
index 1b493f8..8f5910c 100644
--- a/ForgeTracker/forgetracker/version.py
+++ b/ForgeTracker/forgetracker/version.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/widgets/admin.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/admin.py b/ForgeTracker/forgetracker/widgets/admin.py
index 586ce6f..2aba8f8 100644
--- a/ForgeTracker/forgetracker/widgets/admin.py
+++ b/ForgeTracker/forgetracker/widgets/admin.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/admin_custom_fields.py b/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
index 19b55ec..36c9093 100644
--- a/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
+++ b/ForgeTracker/forgetracker/widgets/admin_custom_fields.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/widgets/bin_form.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/bin_form.py b/ForgeTracker/forgetracker/widgets/bin_form.py
index a62026e..e4aeff7 100644
--- a/ForgeTracker/forgetracker/widgets/bin_form.py
+++ b/ForgeTracker/forgetracker/widgets/bin_form.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/widgets/ticket_form.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/ticket_form.py b/ForgeTracker/forgetracker/widgets/ticket_form.py
index 476d9b3..bd37172 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_form.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_form.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/forgetracker/widgets/ticket_search.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/ticket_search.py b/ForgeTracker/forgetracker/widgets/ticket_search.py
index 21c413a..e689e54 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_search.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_search.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeTracker/setup.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/setup.py b/ForgeTracker/setup.py
index d3e00cc..7d3e7a6 100644
--- a/ForgeTracker/setup.py
+++ b/ForgeTracker/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeUserStats/forgeuserstats/controllers/userstats.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/controllers/userstats.py b/ForgeUserStats/forgeuserstats/controllers/userstats.py
index 6194257..a6aa06f 100644
--- a/ForgeUserStats/forgeuserstats/controllers/userstats.py
+++ b/ForgeUserStats/forgeuserstats/controllers/userstats.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -127,7 +131,7 @@ class ForgeUserStatsController(BaseController):
else:
categories[cat] = 1
categories = sorted(categories.items(),
- key=lambda (x, y): y, reverse=True)
+ key=lambda x_y: x_y[1], reverse=True)
ret_dict['lastmonth_logins'] = stats.getLastMonthLogins()
ret_dict['categories'] = categories
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeUserStats/forgeuserstats/main.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/main.py b/ForgeUserStats/forgeuserstats/main.py
index eb25140..dcbe629 100644
--- a/ForgeUserStats/forgeuserstats/main.py
+++ b/ForgeUserStats/forgeuserstats/main.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -24,8 +28,8 @@ from allura.app import Application, SitemapEntry
from allura.lib import helpers as h
from allura import model as M
from allura.eventslistener import EventsListener
-from model.stats import UserStats
-from controllers.userstats import ForgeUserStatsController
+from .model.stats import UserStats
+from .controllers.userstats import ForgeUserStatsController
from forgeuserstats import version
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeUserStats/forgeuserstats/model/stats.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/model/stats.py b/ForgeUserStats/forgeuserstats/model/stats.py
index 2da4618..a825e4f 100644
--- a/ForgeUserStats/forgeuserstats/model/stats.py
+++ b/ForgeUserStats/forgeuserstats/model/stats.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeUserStats/forgeuserstats/tests/test_model.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/tests/test_model.py b/ForgeUserStats/forgeuserstats/tests/test_model.py
index f741159..09e39fe 100644
--- a/ForgeUserStats/forgeuserstats/tests/test_model.py
+++ b/ForgeUserStats/forgeuserstats/tests/test_model.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -443,12 +447,12 @@ class TestUserStats(unittest.TestCase):
login_datetime) < timedelta(seconds=1)
def test_start_date(self):
- stats = USM.UserStats(registration_date=datetime(2012, 04, 01))
- self.assertEqual(stats.start_date, datetime(2012, 04, 01))
+ stats = USM.UserStats(registration_date=datetime(2012, 0o4, 0o1))
+ self.assertEqual(stats.start_date, datetime(2012, 0o4, 0o1))
with h.push_config(config, **{'userstats.start_date': '2013-04-01'}):
- self.assertEqual(stats.start_date, datetime(2013, 04, 01))
+ self.assertEqual(stats.start_date, datetime(2013, 0o4, 0o1))
with h.push_config(config, **{'userstats.start_date': '2011-04-01'}):
- self.assertEqual(stats.start_date, datetime(2012, 04, 01))
+ self.assertEqual(stats.start_date, datetime(2012, 0o4, 0o1))
@mock.patch('allura.model.stats.difflib.unified_diff')
def test_count_loc(self, unified_diff):
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeUserStats/forgeuserstats/tests/test_stats.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/tests/test_stats.py b/ForgeUserStats/forgeuserstats/tests/test_stats.py
index a13d5b4..d16e497 100644
--- a/ForgeUserStats/forgeuserstats/tests/test_stats.py
+++ b/ForgeUserStats/forgeuserstats/tests/test_stats.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeUserStats/forgeuserstats/version.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/version.py b/ForgeUserStats/forgeuserstats/version.py
index 1b493f8..8f5910c 100644
--- a/ForgeUserStats/forgeuserstats/version.py
+++ b/ForgeUserStats/forgeuserstats/version.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeUserStats/forgeuserstats/widgets/forms.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/widgets/forms.py b/ForgeUserStats/forgeuserstats/widgets/forms.py
index a807e8c..784b69c 100644
--- a/ForgeUserStats/forgeuserstats/widgets/forms.py
+++ b/ForgeUserStats/forgeuserstats/widgets/forms.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeUserStats/setup.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/setup.py b/ForgeUserStats/setup.py
index 1ad5c3a..4540297 100644
--- a/ForgeUserStats/setup.py
+++ b/ForgeUserStats/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/converters.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/converters.py b/ForgeWiki/forgewiki/converters.py
index 95b88f7..584b389 100644
--- a/ForgeWiki/forgewiki/converters.py
+++ b/ForgeWiki/forgewiki/converters.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/model/__init__.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/model/__init__.py b/ForgeWiki/forgewiki/model/__init__.py
index 02aa205..e8203ad 100644
--- a/ForgeWiki/forgewiki/model/__init__.py
+++ b/ForgeWiki/forgewiki/model/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import print_function
+from __future__ import division
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,4 +19,4 @@
# specific language governing permissions and limitations
# under the License.
-from wiki import Page, WikiAttachment, Globals, PageHistory
+from .wiki import Page, WikiAttachment, Globals, PageHistory
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/model/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/model/wiki.py b/ForgeWiki/forgewiki/model/wiki.py
index 2ca4f8f..a515db8 100644
--- a/ForgeWiki/forgewiki/model/wiki.py
+++ b/ForgeWiki/forgewiki/model/wiki.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/functional/test_rest.py b/ForgeWiki/forgewiki/tests/functional/test_rest.py
index 560503e..335354b 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_rest.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_rest.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import json
from nose.tools import assert_equal, assert_in
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py
index f5f49e6..889fa40 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import StringIO
import allura
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/tests/test_app.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/test_app.py b/ForgeWiki/forgewiki/tests/test_app.py
index 484a6ee..c584657 100644
--- a/ForgeWiki/forgewiki/tests/test_app.py
+++ b/ForgeWiki/forgewiki/tests/test_app.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/tests/test_converters.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/test_converters.py b/ForgeWiki/forgewiki/tests/test_converters.py
index f30bf1d..9e58398 100644
--- a/ForgeWiki/forgewiki/tests/test_converters.py
+++ b/ForgeWiki/forgewiki/tests/test_converters.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/tests/test_models.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/test_models.py b/ForgeWiki/forgewiki/tests/test_models.py
index 2ab2f00..db544f5 100644
--- a/ForgeWiki/forgewiki/tests/test_models.py
+++ b/ForgeWiki/forgewiki/tests/test_models.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/tests/test_wiki_roles.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/test_wiki_roles.py b/ForgeWiki/forgewiki/tests/test_wiki_roles.py
index 64b5f03..5c5bc11 100644
--- a/ForgeWiki/forgewiki/tests/test_wiki_roles.py
+++ b/ForgeWiki/forgewiki/tests/test_wiki_roles.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/version.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/version.py b/ForgeWiki/forgewiki/version.py
index 1b493f8..8f5910c 100644
--- a/ForgeWiki/forgewiki/version.py
+++ b/ForgeWiki/forgewiki/version.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/widgets/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/widgets/wiki.py b/ForgeWiki/forgewiki/widgets/wiki.py
index 7dc8b56..a889a60 100644
--- a/ForgeWiki/forgewiki/widgets/wiki.py
+++ b/ForgeWiki/forgewiki/widgets/wiki.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 5f15779..dc9f812 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/ForgeWiki/setup.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/setup.py b/ForgeWiki/setup.py
index 76db941..d2c86a5 100644
--- a/ForgeWiki/setup.py
+++ b/ForgeWiki/setup.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/fuse/accessfs.py
----------------------------------------------------------------------
diff --git a/fuse/accessfs.py b/fuse/accessfs.py
index 56808f8..730fdc7 100644
--- a/fuse/accessfs.py
+++ b/fuse/accessfs.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import json
import urllib
@@ -101,7 +105,7 @@ class AccessFS(fuse.Fuse):
return os.readlink("." + path)
def readdir(self, path, offset):
- print 'Readdir!'
+ print('Readdir!')
for e in os.listdir("." + path):
yield fuse.Direntry(e)
@@ -311,7 +315,7 @@ class PermissionCache(object):
entry, timestamp = self._data[uid, path]
elapsed = time.time() - timestamp
if elapsed > self._timeout:
- print 'Timeout!', elapsed
+ print('Timeout!', elapsed)
uname = self._uid_cache.get(uid)
entry = self._refresh_result(
uid, path, self._api_lookup(uname, path))
@@ -338,10 +342,10 @@ class PermissionCache(object):
+ urllib.urlencode(dict(
repo_path=path,
username=uname)))
- print 'Checking access for %s at %s (%s)' % (uname, url, path)
+ print('Checking access for %s at %s (%s)' % (uname, url, path))
fp = urllib2.urlopen(url)
result = json.load(fp)
- print result
+ print(result)
entry = 0
if result['allow_read']:
entry |= os.R_OK
@@ -413,7 +417,7 @@ Userspace nullfs-alike: mirror the filesystem tree from some point on.
if server.fuse_args.mount_expected():
os.chdir(server.root)
except OSError:
- print >> sys.stderr, "can't enter root of underlying filesystem"
+ print("can't enter root of underlying filesystem", file=sys.stderr)
sys.exit(1)
server.main()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/ApacheAccessHandler.py
----------------------------------------------------------------------
diff --git a/scripts/ApacheAccessHandler.py b/scripts/ApacheAccessHandler.py
index 1af3714..3264c8c 100644
--- a/scripts/ApacheAccessHandler.py
+++ b/scripts/ApacheAccessHandler.py
@@ -43,6 +43,10 @@ Here is a quick example for your apache settings (assuming ProxyPass)
</Location>
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from mod_python import apache
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/add_user_to_group.py
----------------------------------------------------------------------
diff --git a/scripts/add_user_to_group.py b/scripts/add_user_to_group.py
index aa2fe1e..65888fa 100644
--- a/scripts/add_user_to_group.py
+++ b/scripts/add_user_to_group.py
@@ -35,6 +35,10 @@ Example:
$ paster script production.ini ../scripts/add_user_to_group.py -- admin1 Admin --nbhd=/berlios/
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
from allura import model as M
from ming.orm import ThreadLocalORMSession
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/allura_import.py
----------------------------------------------------------------------
diff --git a/scripts/allura_import.py b/scripts/allura_import.py
index d4e51fd..a0fefa7 100644
--- a/scripts/allura_import.py
+++ b/scripts/allura_import.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -40,7 +44,7 @@ def main():
if type(user_map) is not type({}):
raise ValueError
for k, v in user_map.iteritems():
- print k, v
+ print(k, v)
if not isinstance(k, basestring) or not isinstance(v, basestring):
raise ValueError
except ValueError:
@@ -71,10 +75,10 @@ def import_forum(cli, project, tool, user_map, doc_txt, validate=True,
)
if validate:
url += '/validate_import'
- print cli.call(url, doc=doc_txt, user_map=json.dumps(user_map))
+ print(cli.call(url, doc=doc_txt, user_map=json.dumps(user_map)))
else:
url += '/perform_import'
- print cli.call(url, doc=doc_txt, user_map=json.dumps(user_map))
+ print(cli.call(url, doc=doc_txt, user_map=json.dumps(user_map)))
def parse_options():
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/changelog.py
----------------------------------------------------------------------
diff --git a/scripts/changelog.py b/scripts/changelog.py
index 8f49e94..c41f83f 100755
--- a/scripts/changelog.py
+++ b/scripts/changelog.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import sys
import re
import git
@@ -61,12 +65,12 @@ def get_ticket_summaries(tickets):
def print_changelog(version, summaries):
- print 'Version {version} ({date})\n'.format(**{
+ print('Version {version} ({date})\n'.format(**{
'version': version,
'date': datetime.utcnow().strftime('%B %Y'),
- })
+ }))
for ticket in sorted(summaries.keys()):
- print " * [#{0}] {1}".format(ticket, summaries[ticket].encode('utf-8'))
+ print(" * [#{0}] {1}".format(ticket, summaries[ticket].encode('utf-8')))
if __name__ == '__main__':
main()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/create-allura-sitemap.py
----------------------------------------------------------------------
diff --git a/scripts/create-allura-sitemap.py b/scripts/create-allura-sitemap.py
index f39b2a6..1124a16 100644
--- a/scripts/create-allura-sitemap.py
+++ b/scripts/create-allura-sitemap.py
@@ -27,6 +27,10 @@ things that would make it faster, if we need/want to.
2. Use multiprocessing to distribute the offsets to n subprocesses.
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import sys
@@ -84,7 +88,7 @@ def main(options):
sys.exit('Error: %s directory already exists.' % output_path)
try:
os.mkdir(output_path)
- except OSError, e:
+ except OSError as e:
sys.exit("Error: Couldn't create %s:\n%s" % (output_path, e))
now = datetime.utcnow().date()
@@ -115,9 +119,9 @@ def main(options):
locs.append({'url': url,
'date': p.last_updated.strftime("%Y-%m-%d")})
- except Exception, e:
- print "Error creating sitemap for project '%s': %s" %\
- (p.shortname, e)
+ except Exception as e:
+ print("Error creating sitemap for project '%s': %s" %\
+ (p.shortname, e))
creds.clear()
if len(locs) >= options.urls_per_file:
write_sitemap(locs[:options.urls_per_file], file_count)
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/create-moved-tickets.py
----------------------------------------------------------------------
diff --git a/scripts/create-moved-tickets.py b/scripts/create-moved-tickets.py
index 04ce906..2d6bd04 100644
--- a/scripts/create-moved-tickets.py
+++ b/scripts/create-moved-tickets.py
@@ -22,6 +22,10 @@ This is for making redirects for tickets that we move from SourceForge
to Apache, but could be generalized pretty easily to work for making
any type of redirect (change SF/Apache specifics to commandline arguments)
'''
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import argparse
import pymongo
@@ -52,8 +56,8 @@ nbhd = main_db.neighborhood.find_one({'url_prefix': '/%s/' % opts.n})
project = main_db.project.find_one({'neighborhood_id': nbhd['_id'], 'shortname': opts.p})
tool = project_data.config.find_one({'project_id': project['_id'], 'options.mount_point': opts.t})
-print "Tool id: %s" % tool['_id']
-print 'Setting app_config_id to: %s for tickets: %s' % ('moved-to-apache', ticket_nums)
+print("Tool id: %s" % tool['_id'])
+print('Setting app_config_id to: %s for tickets: %s' % ('moved-to-apache', ticket_nums))
if not opts.dry_run:
project_data.ticket.update({
@@ -61,7 +65,7 @@ if not opts.dry_run:
'ticket_num': {'$in': ticket_nums}
}, {'$set': {'app_config_id': 'moved-to-apache'}}, multi=True)
-print 'Creating MovingTickets for tickets: %s' % ticket_nums
+print('Creating MovingTickets for tickets: %s' % ticket_nums)
if not opts.dry_run:
for num in ticket_nums:
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/fix-wiki-page-names.py
----------------------------------------------------------------------
diff --git a/scripts/fix-wiki-page-names.py b/scripts/fix-wiki-page-names.py
index b53e708..4731f7d 100644
--- a/scripts/fix-wiki-page-names.py
+++ b/scripts/fix-wiki-page-names.py
@@ -16,6 +16,10 @@
# under the License.
"""Rename page/title to page-title"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import sys
import logging
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/import_trove_categories.py
----------------------------------------------------------------------
diff --git a/scripts/import_trove_categories.py b/scripts/import_trove_categories.py
index 123a56c..e884a73 100644
--- a/scripts/import_trove_categories.py
+++ b/scripts/import_trove_categories.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/000-fix-tracker-fields.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/000-fix-tracker-fields.py b/scripts/migrations/000-fix-tracker-fields.py
index 5d2b6b1..1159442 100644
--- a/scripts/migrations/000-fix-tracker-fields.py
+++ b/scripts/migrations/000-fix-tracker-fields.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/001-restore-labels.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/001-restore-labels.py b/scripts/migrations/001-restore-labels.py
index ef68c09..59b787f 100644
--- a/scripts/migrations/001-restore-labels.py
+++ b/scripts/migrations/001-restore-labels.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/002-fix-tracker-thread-subjects.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/002-fix-tracker-thread-subjects.py b/scripts/migrations/002-fix-tracker-thread-subjects.py
index 81861a0..f65502b 100644
--- a/scripts/migrations/002-fix-tracker-thread-subjects.py
+++ b/scripts/migrations/002-fix-tracker-thread-subjects.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/003-migrate_project_roles.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/003-migrate_project_roles.py b/scripts/migrations/003-migrate_project_roles.py
index 32bcc57..9edce70 100644
--- a/scripts/migrations/003-migrate_project_roles.py
+++ b/scripts/migrations/003-migrate_project_roles.py
@@ -17,6 +17,10 @@
'''Merge all the OldProjectRole collections in into a ProjectRole collection.
'''
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
from ming.orm import session, state
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/004-make-attachments-polymorphic.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/004-make-attachments-polymorphic.py b/scripts/migrations/004-make-attachments-polymorphic.py
index e6133ec..7d2ad3f 100644
--- a/scripts/migrations/004-make-attachments-polymorphic.py
+++ b/scripts/migrations/004-make-attachments-polymorphic.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/005-remove_duplicate_ticket_notifications.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/005-remove_duplicate_ticket_notifications.py b/scripts/migrations/005-remove_duplicate_ticket_notifications.py
index 716c604..6d49f96 100644
--- a/scripts/migrations/005-remove_duplicate_ticket_notifications.py
+++ b/scripts/migrations/005-remove_duplicate_ticket_notifications.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -34,16 +38,16 @@ log = logging.getLogger(__name__)
def trim_subs(subs, test):
prime = False
- print "Found %d '%s' subs with for user '%s'" % (len(subs), subs[0].artifact_title, str(subs[0].user_id))
+ print("Found %d '%s' subs with for user '%s'" % (len(subs), subs[0].artifact_title, str(subs[0].user_id)))
for sub in subs:
if sub.artifact_url and not prime:
prime = True
- print " Keeping good subscription with a URL of '%s'" % sub.artifact_url
+ print(" Keeping good subscription with a URL of '%s'" % sub.artifact_url)
else:
if not sub.artifact_url:
- print " Found subscription with no artifact URL, deleting."
+ print(" Found subscription with no artifact URL, deleting.")
else:
- print " Subscription has URL, but is a duplicate, deleting."
+ print(" Subscription has URL, but is a duplicate, deleting.")
if not test:
sub.delete()
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/006-migrate-artifact-refs.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/006-migrate-artifact-refs.py b/scripts/migrations/006-migrate-artifact-refs.py
index aeae677..e2f8f82 100644
--- a/scripts/migrations/006-migrate-artifact-refs.py
+++ b/scripts/migrations/006-migrate-artifact-refs.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/007-update-acls.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/007-update-acls.py b/scripts/migrations/007-update-acls.py
index 0f97ee1..04eabaf 100644
--- a/scripts/migrations/007-update-acls.py
+++ b/scripts/migrations/007-update-acls.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -77,8 +81,8 @@ def main():
log.info('====================================')
log.info('Update neighborhood ACLs')
for n in q_neighborhoods:
- p = c_project.find(dict(
- neighborhood_id=n['_id'], shortname='--init--')).next()
+ p = next(c_project.find(dict(
+ neighborhood_id=n['_id'], shortname='--init--')))
update_neighborhood_acl(n, p)
if not options.test:
c_neighborhood.save(n)
@@ -149,7 +153,7 @@ def update_neighborhood_acl(neighborhood_doc, init_doc):
new_acl = list(init_doc['acl'])
assert acl['read'] == [None] # nbhd should be public
for uid in acl['admin'] + acl['moderate']:
- u = c_user.find(dict(_id=uid)).next()
+ u = next(c_user.find(dict(_id=uid)))
if options.test:
log.info('... grant nbhd admin to: %s', u['username'])
continue
@@ -227,7 +231,7 @@ def _format_role(rid):
if role['name']:
return role['name']
if role['user_id']:
- u = c_user.find(_id=role['user_id']).next()
+ u = next(c_user.find(_id=role['user_id']))
return u['username']
break
return '--invalid--'
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/008-remove-forumpost-subject.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/008-remove-forumpost-subject.py b/scripts/migrations/008-remove-forumpost-subject.py
index af344d5..874fa75 100644
--- a/scripts/migrations/008-remove-forumpost-subject.py
+++ b/scripts/migrations/008-remove-forumpost-subject.py
@@ -18,6 +18,10 @@
"""
Remove the subject FieldProperty from all ForumPost objects. [#2071]
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
import sys
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/009-set_landing_page.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/009-set_landing_page.py b/scripts/migrations/009-set_landing_page.py
index 65ca7a1..9f490b4 100644
--- a/scripts/migrations/009-set_landing_page.py
+++ b/scripts/migrations/009-set_landing_page.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/010-fix-home-permissions.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/010-fix-home-permissions.py b/scripts/migrations/010-fix-home-permissions.py
index 4506a17..26be5f3 100644
--- a/scripts/migrations/010-fix-home-permissions.py
+++ b/scripts/migrations/010-fix-home-permissions.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/011-fix-subroles.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/011-fix-subroles.py b/scripts/migrations/011-fix-subroles.py
index cb63c6b..19b6ea3 100644
--- a/scripts/migrations/011-fix-subroles.py
+++ b/scripts/migrations/011-fix-subroles.py
@@ -26,6 +26,10 @@ For project.users:
* user.project_role().roles, if it contains Developer, should not contain
Member
"""
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import sys
import logging
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/012-uninstall-home.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/012-uninstall-home.py b/scripts/migrations/012-uninstall-home.py
index c59fdb2..8447295 100644
--- a/scripts/migrations/012-uninstall-home.py
+++ b/scripts/migrations/012-uninstall-home.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/013-update-ordinals.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/013-update-ordinals.py b/scripts/migrations/013-update-ordinals.py
index f26f112..8724347 100644
--- a/scripts/migrations/013-update-ordinals.py
+++ b/scripts/migrations/013-update-ordinals.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py b/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py
index 8c4abd9..5b75d35 100644
--- a/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py
+++ b/scripts/migrations/015-add-neighborhood_id-to-blog-posts.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/018-add-svn-checkout-url.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/018-add-svn-checkout-url.py b/scripts/migrations/018-add-svn-checkout-url.py
index 2a5469c..078fd47 100644
--- a/scripts/migrations/018-add-svn-checkout-url.py
+++ b/scripts/migrations/018-add-svn-checkout-url.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/020-remove-wiki-title-slashes.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/020-remove-wiki-title-slashes.py b/scripts/migrations/020-remove-wiki-title-slashes.py
index 34db4ce..43c9e53 100644
--- a/scripts/migrations/020-remove-wiki-title-slashes.py
+++ b/scripts/migrations/020-remove-wiki-title-slashes.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -29,10 +33,10 @@ log = logging.getLogger(__name__)
def main():
c.project = None
pages = WM.Page.query.find({'title': {'$regex': '\/'}}).all()
- print 'Found %s wiki titles containing "/"...' % len(pages)
+ print('Found %s wiki titles containing "/"...' % len(pages))
for page in pages:
page.title = page.title.replace('/', '-')
- print 'Updated: %s' % page.title
+ print('Updated: %s' % page.title)
ThreadLocalORMSession.flush_all()
if __name__ == '__main__':
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/022-change-anon-display-name.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/022-change-anon-display-name.py b/scripts/migrations/022-change-anon-display-name.py
index dbe9911..95ae267 100644
--- a/scripts/migrations/022-change-anon-display-name.py
+++ b/scripts/migrations/022-change-anon-display-name.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/024-migrate-custom-profile-text.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/024-migrate-custom-profile-text.py b/scripts/migrations/024-migrate-custom-profile-text.py
index 18a82da..19db2d5 100644
--- a/scripts/migrations/024-migrate-custom-profile-text.py
+++ b/scripts/migrations/024-migrate-custom-profile-text.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/025-add-is-nbhd-project.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/025-add-is-nbhd-project.py b/scripts/migrations/025-add-is-nbhd-project.py
index ca3fc77..9e92878 100644
--- a/scripts/migrations/025-add-is-nbhd-project.py
+++ b/scripts/migrations/025-add-is-nbhd-project.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/026-install-activity-tool.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/026-install-activity-tool.py b/scripts/migrations/026-install-activity-tool.py
index c7eb39f..f25b807 100644
--- a/scripts/migrations/026-install-activity-tool.py
+++ b/scripts/migrations/026-install-activity-tool.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/027-change-ticket-write-permissions.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/027-change-ticket-write-permissions.py b/scripts/migrations/027-change-ticket-write-permissions.py
index 3c6877a..9c5e42c 100644
--- a/scripts/migrations/027-change-ticket-write-permissions.py
+++ b/scripts/migrations/027-change-ticket-write-permissions.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/028-remove-svn-trees.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/028-remove-svn-trees.py b/scripts/migrations/028-remove-svn-trees.py
index 79e82aa..019325b 100644
--- a/scripts/migrations/028-remove-svn-trees.py
+++ b/scripts/migrations/028-remove-svn-trees.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -33,16 +37,16 @@ def kill_tree(repo, commit_id, path, tree):
tid = repo._tree_oid(commit_id, path + '/' + tree_rec.name)
child_tree = M.repository.Tree.query.get(_id=tid)
if child_tree:
- print ' Found {0}'.format((path + '/' + tree_rec.name).encode('utf8'))
+ print(' Found {0}'.format((path + '/' + tree_rec.name).encode('utf8')))
kill_tree(repo, commit_id, path + '/' + tree_rec.name, child_tree)
else:
- print ' Missing {0}'.format((path + '/' + tree_rec.name).encode('utf8'))
+ print(' Missing {0}'.format((path + '/' + tree_rec.name).encode('utf8')))
def main():
for chunk in utils.chunked_find(SM.Repository):
for r in chunk:
- print 'Processing {0}'.format(r)
+ print('Processing {0}'.format(r))
all_commit_ids = r._impl.all_commit_ids()
if all_commit_ids:
for commit in M.repository.Commit.query.find({'_id': {'$in': all_commit_ids}}):
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/029-set-mailbox-queue_empty.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/029-set-mailbox-queue_empty.py b/scripts/migrations/029-set-mailbox-queue_empty.py
index c2075b7..b18793f 100644
--- a/scripts/migrations/029-set-mailbox-queue_empty.py
+++ b/scripts/migrations/029-set-mailbox-queue_empty.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/migrations/031-set-user-pending-to-false.py
----------------------------------------------------------------------
diff --git a/scripts/migrations/031-set-user-pending-to-false.py b/scripts/migrations/031-set-user-pending-to-false.py
index 02d35d9..7f58ca7 100644
--- a/scripts/migrations/031-set-user-pending-to-false.py
+++ b/scripts/migrations/031-set-user-pending-to-false.py
@@ -1,3 +1,7 @@
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -28,7 +32,7 @@ log = logging.getLogger(__name__)
def main():
for chunk in utils.chunked_find(M.User):
for user in chunk:
- print 'Processing {0}'.format(user.username)
+ print('Processing {0}'.format(user.username))
user.pending = False
# Ming doesn't mark document for update, since pending is False
# by default, even if field is missing from mongo
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/new_ticket.py
----------------------------------------------------------------------
diff --git a/scripts/new_ticket.py b/scripts/new_ticket.py
index 9b23328..5c6970f 100755
--- a/scripts/new_ticket.py
+++ b/scripts/new_ticket.py
@@ -16,6 +16,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import sys
import argparse
import requests
@@ -36,10 +40,10 @@ def get_opts():
opts = get_opts()
access_token = raw_input('Access (bearer) token: ')
summary = raw_input('Summary: ')
-print 'Description (C-d to end):'
-print '-----------------------------------------------'
+print('Description (C-d to end):')
+print('-----------------------------------------------')
description = sys.stdin.read()
-print '-----------------------------------------------'
+print('-----------------------------------------------')
r = requests.post(opts.url, params={
'access_token': access_token,
@@ -47,7 +51,7 @@ r = requests.post(opts.url, params={
'ticket_form.description': description,
})
if r.status_code == 200:
- print 'Ticket created at: %s' % r.url
+ print('Ticket created at: %s' % r.url)
pprint(r.json())
else:
- print 'Error [%s]:\n%s' % (r.status_code, r.text)
+ print('Error [%s]:\n%s' % (r.status_code, r.text))
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/open_relay.py
----------------------------------------------------------------------
diff --git a/scripts/open_relay.py b/scripts/open_relay.py
index ba21862..bbf1833 100644
--- a/scripts/open_relay.py
+++ b/scripts/open_relay.py
@@ -17,6 +17,10 @@
# specific language governing permissions and limitations
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import logging
import os
import smtpd
http://git-wip-us.apache.org/repos/asf/allura/blob/3640d5f6/scripts/perf/benchmark-scm.py
----------------------------------------------------------------------
diff --git a/scripts/perf/benchmark-scm.py b/scripts/perf/benchmark-scm.py
index be9b93a..de39e2c 100755
--- a/scripts/perf/benchmark-scm.py
+++ b/scripts/perf/benchmark-scm.py
@@ -18,6 +18,10 @@
# under the License.
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import sys
import argparse
@@ -71,9 +75,9 @@ def main(opts):
impl(repo, cid, path, names, opts.repo_path)
end = datetime.now()
total += (end - start).total_seconds()
- print
- print 'Total time: %s' % total
- print 'Average time per run: %s' % (total / opts.count)
+ print()
+ print('Total time: %s' % total)
+ print('Average time per run: %s' % (total / opts.count))
def impl_git_tree(repo, cid, path, names, *args):
[13/14] allura git commit: [#7878] ticket:771 Fix AntiSpam
Posted by je...@apache.org.
[#7878] ticket:771 Fix AntiSpam
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/318560e3
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/318560e3
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/318560e3
Branch: refs/heads/ib/7878
Commit: 318560e38c7989b93daf3f622ded90586d07aa7a
Parents: 785c254
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue May 19 12:15:24 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue May 19 12:15:24 2015 +0000
----------------------------------------------------------------------
Allura/allura/lib/utils.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/318560e3/Allura/allura/lib/utils.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py
index 3593872..236e3f9 100644
--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -287,7 +287,7 @@ class AntiSpam(object):
tx_tbl = string.maketrans('+/', '-_')
s = binascii.b2a_base64(s)
s = s.rstrip('=\n')
- s = s.translate(tx_tbl)
+ s = str(s).translate(tx_tbl)
s = 'X' + s
return s
@@ -312,10 +312,10 @@ class AntiSpam(object):
plain = ([len(plain)]
+ map(ord, plain)
+ self.random_padding[:len(self.spinner_ord) - len(plain) - 1])
- enc = ''.join(chr(p ^ s) for p, s in zip(plain, self.spinner_ord))
+ enc = b''.join(chr(p ^ s) for p, s in zip(plain, self.spinner_ord))
enc = self._wrap(enc)
if css_safe:
- enc = ''.join(ch for ch in enc if ch.isalpha())
+ enc = b''.join(ch for ch in enc if ch.isalpha())
return enc
def dec(self, enc):
@@ -323,7 +323,7 @@ class AntiSpam(object):
enc = list(map(ord, enc))
plain = [e ^ s for e, s in zip(enc, self.spinner_ord)]
plain = plain[1:1 + plain[0]]
- plain = ''.join(map(chr, plain))
+ plain = b''.join(map(chr, plain))
return plain
def extra_fields(self):
[10/14] allura git commit: [#7878] ticket:771 Convert MappedClass
polymorphic_identity to bytes
Posted by je...@apache.org.
[#7878] ticket:771 Convert MappedClass polymorphic_identity to bytes
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/4078299a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/4078299a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/4078299a
Branch: refs/heads/ib/7878
Commit: 4078299aa98d05983825e11e0787f9dc20ffddbc
Parents: 9a12817
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue May 19 10:36:12 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue May 19 10:36:12 2015 +0000
----------------------------------------------------------------------
Allura/allura/model/discuss.py | 2 +-
Allura/allura/model/oauth.py | 6 +++---
ForgeBlog/forgeblog/model/blog.py | 2 +-
ForgeDiscussion/forgediscussion/model/forum.py | 2 +-
ForgeTracker/forgetracker/model/ticket.py | 2 +-
ForgeWiki/forgewiki/model/wiki.py | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/4078299a/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index abce767..2439f23 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -746,7 +746,7 @@ class DiscussionAttachment(BaseAttachment):
thumbnail_size = (100, 100)
class __mongometa__:
- polymorphic_identity = 'DiscussionAttachment'
+ polymorphic_identity = b'DiscussionAttachment'
indexes = ['filename', 'discussion_id', 'thread_id', 'post_id']
discussion_id = FieldProperty(schema.ObjectId)
http://git-wip-us.apache.org/repos/asf/allura/blob/4078299a/Allura/allura/model/oauth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/oauth.py b/Allura/allura/model/oauth.py
index 7c27366..aa75429 100644
--- a/Allura/allura/model/oauth.py
+++ b/Allura/allura/model/oauth.py
@@ -64,7 +64,7 @@ class OAuthToken(MappedClass):
class OAuthConsumerToken(OAuthToken):
class __mongometa__:
- polymorphic_identity = 'consumer'
+ polymorphic_identity = b'consumer'
name = b'oauth_consumer_token'
unique_indexes = [('name', 'user_id')]
@@ -108,7 +108,7 @@ class OAuthConsumerToken(OAuthToken):
class OAuthRequestToken(OAuthToken):
class __mongometa__:
- polymorphic_identity = 'request'
+ polymorphic_identity = b'request'
type = FieldProperty(str, if_missing='request')
consumer_token_id = ForeignIdProperty('OAuthConsumerToken')
@@ -122,7 +122,7 @@ class OAuthRequestToken(OAuthToken):
class OAuthAccessToken(OAuthToken):
class __mongometa__:
- polymorphic_identity = 'access'
+ polymorphic_identity = b'access'
type = FieldProperty(str, if_missing='access')
consumer_token_id = ForeignIdProperty('OAuthConsumerToken')
http://git-wip-us.apache.org/repos/asf/allura/blob/4078299a/ForgeBlog/forgeblog/model/blog.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index 71f78e4..cf22e8b 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -305,7 +305,7 @@ class Attachment(M.BaseAttachment):
ArtifactClass = BlogPost
class __mongometa__:
- polymorphic_identity = 'BlogAttachment'
+ polymorphic_identity = b'BlogAttachment'
attachment_type = FieldProperty(str, if_missing='BlogAttachment')
http://git-wip-us.apache.org/repos/asf/allura/blob/4078299a/ForgeDiscussion/forgediscussion/model/forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/model/forum.py b/ForgeDiscussion/forgediscussion/model/forum.py
index 73ffa57..abec612 100644
--- a/ForgeDiscussion/forgediscussion/model/forum.py
+++ b/ForgeDiscussion/forgediscussion/model/forum.py
@@ -256,7 +256,7 @@ class ForumAttachment(M.DiscussionAttachment):
PostClass = ForumPost
class __mongometa__:
- polymorphic_identity = 'ForumAttachment'
+ polymorphic_identity = b'ForumAttachment'
attachment_type = FieldProperty(str, if_missing='ForumAttachment')
Mapper.compile_all()
http://git-wip-us.apache.org/repos/asf/allura/blob/4078299a/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index bd8c4ee..c423f36 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -1287,7 +1287,7 @@ class TicketAttachment(BaseAttachment):
ArtifactType = Ticket
class __mongometa__:
- polymorphic_identity = 'TicketAttachment'
+ polymorphic_identity = b'TicketAttachment'
attachment_type = FieldProperty(str, if_missing='TicketAttachment')
http://git-wip-us.apache.org/repos/asf/allura/blob/4078299a/ForgeWiki/forgewiki/model/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/model/wiki.py b/ForgeWiki/forgewiki/model/wiki.py
index 7603688..dd18b2f 100644
--- a/ForgeWiki/forgewiki/model/wiki.py
+++ b/ForgeWiki/forgewiki/model/wiki.py
@@ -259,7 +259,7 @@ class WikiAttachment(BaseAttachment):
ArtifactType = Page
class __mongometa__:
- polymorphic_identity = 'WikiAttachment'
+ polymorphic_identity = b'WikiAttachment'
attachment_type = FieldProperty(str, if_missing='WikiAttachment')
Mapper.compile_all()