Merge upstream

.htaccess

@@ -11,8 +11,7 @@
 #
 # (See also http://brat.nlplab.org/troubleshooting.html)
 <FilesMatch "^(\.htaccess|config\.py)$">
-    Order allow,deny
-    Deny from all
+    Require all denied
 </FilesMatch>
 
 Options +ExecCGI +FollowSymLinks

CONTRIBUTORS.md

@@ -8,7 +8,8 @@ In order by changed lines of code ([Ballmer][ballmer] says [SLOC][sloc]
 
 * Pontus Stenetorp          <pontus is s u-tokyo ac jp>
 * Sampo Pyysalo             <smp is s u-tokyo ac jp>
-* Goran Topić               <goran is s u-tokyo ac jp>
+* Goran Topić               <amadanmath gmail com>
+* Ben Auffarth              <auffarth gmail com>
 * Tomoko Ohta               <tomoko.ohta manchester ac uk>
 * Pierre-Francois Laquerre  <pierre.francois gmail com>
 * Illés Solt                <solt tmit bme hu>

README.md

@@ -114,6 +114,6 @@ are recognised in the CONTRIBUTORS.md file.
 For help and feedback please contact the authors below, preferably with all on
 them on CC since their responsibilities and availability may vary:
 
-* Goran Topić       <goran_topic nii ac jp>
+* Goran Topić       <amadanmath gmail com>
 * Sampo Pyysalo     <sampo.pyysalo gmail com>
 * Pontus Stenetorp  <pontus stenetorp se>

ajax.cgi

@@ -1,14 +1,13 @@
-#!/usr/bin/env python
-# -*- Mode: Python; tab-width: 4; indent-tabs-mode: nil; -*- 
+#!/usr/bin/env python3
+# -*- Mode: Python; tab-width: 4; indent-tabs-mode: nil; -*-
 # vim:set ft=python ts=4 sw=4 sts=4 autoindent:
 
-'''
-Entry for CGI calls to brat. A simple wrapper around the CGI handling that then
-delegates the work to the CGI-agnostic brat server.
+"""Entry for CGI calls to brat. A simple wrapper around the CGI handling that
+then delegates the work to the CGI-agnostic brat server.
 
 Author:     Pontus Stenetorp    <pontus is s u-tokyo ac jp>
 Version:    2011-02-07
-'''
+"""
 
 # Standard library imports
 from cgi import FieldStorage
@@ -22,6 +21,9 @@ sys_path.append(path_join(dirname(__file__), 'server/src'))
 
 from server import serve
 
+
+stdout = open(stdout.fileno(), mode='w', encoding='utf8', buffering=1)
+
 def main(args):
     # Get data required for server call
     try:
@@ -41,7 +43,7 @@ def main(args):
 
     # Call main server
     cookie_hdrs, response_data = serve(params, remote_addr, remote_host,
-            cookie_data)
+                                       cookie_data)
 
     # Package and send response
     if cookie_hdrs is not None:
@@ -53,30 +55,34 @@ def main(args):
     stdout.write('\n'.join('%s: %s' % (k, v) for k, v in response_hdrs))
     stdout.write('\n')
     stdout.write('\n')
-    # Hack to support binary data and general Unicode for SVGs and JSON
-    if isinstance(response_data[1], unicode):
-        stdout.write(response_data[1].encode('utf-8'))
+    if isinstance(response_data[1], bytes):
+        stdout.flush()
+        stdout.buffer.write(response_data[1])
     else:
         stdout.write(response_data[1])
     return 0
 
+
 def profile_main(argv):
     # runs main() with profiling, storing in a rotating set of files
     # in work. To see a profile, run e.g.
-    # python -c 'import pstats; pstats.Stats("work/serverprofile0").strip_dirs().sort_stats("time").print_stats()' | less
+    # python -c 'import pstats;
+    # pstats.Stats("work/serverprofile0").strip_dirs().sort_stats("time").print_stats()'
+    # | less
     import cProfile
     import os.path
-    for i in range(0,10):
-        pfn = 'work/serverprofile'+str(i)
+    for i in range(0, 10):
+        pfn = 'work/serverprofile' + str(i)
         if not os.path.exists(pfn):
             break
     if os.path.exists(pfn):
         # rotate back; TODO: clear next in rotation
         pfn = 'work/serverprofile0'
     cProfile.run('main(argv)', pfn)
 
+
 if __name__ == '__main__':
     from sys import argv, exit
     exit(main(argv))
     # To turn on server profiles, comment out the line above and use the one below.
-    #exit(profile_main(argv))
+    # exit(profile_main(argv))