anru · Feb 1, 2021 · Feb 9, 2021 · Feb 9, 2021 · Feb 9, 2021 · Feb 9, 2021
diff --git a/README.rst b/README.rst
@@ -1,6 +1,15 @@
+RSTED
+=====
+
 Simple online editor for reStructuredText on Flask.
 
-Try it where: http://rst.ninjs.org/
+This repository contains the necessary modifications to run on Python3
+with up-to-date versions of the packages it depends upon. The original
+repository at https://github.com/anru/rsted is no longer maintained,
+and works only on Python2.
+
+You can try it at http://destrangis.eu.pythonanywhere.com as the former link (http://rst.ninjs.org/) is, alas, no longer
+working.
 
 Getting setup
 -------------

diff --git a/application.py b/application.py
@@ -1,9 +1,9 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # all the imports
 
 import os, sys
-reload(sys)
-sys.setdefaultencoding('utf-8')
+#reload(sys)
+#sys.setdefaultencoding('utf-8')
 
 from flask import Flask, request, render_template, make_response, url_for
 

diff --git a/pwl/fastcgi.py b/pwl/fastcgi.py
@@ -86,9 +86,9 @@
 
 
 def fastcgi_help(message=None):
-    print FASTCGI_HELP
+    print(FASTCGI_HELP)
     if message:
-        print message
+        print(message)
     return False
 
 
@@ -114,16 +114,16 @@ def runfastcgi(app, argset=[], **kwargs):
         if pw:
             os.setresgid(pw.pw_gid, pw.pw_gid, pw.pw_gid)
             os.setresuid(pw.pw_uid, pw.pw_uid, pw.pw_uid)
-        
+
 
     try:
         import flup
-    except ImportError, e:
-        print >> sys.stderr, 'ERROR: %s' % e
-        print >> sys.stderr, '  Unable to load the flup package.  In order to run rsted'
-        print >> sys.stderr, '  as a FastCGI application, you will need to get flup from'
-        print >> sys.stderr, "  http://www.saddi.com/software/flup/   If you've already"
-        print >> sys.stderr, '  installed flup, then make sure you have it in your PYTHONPATH.'
+    except ImportError as e:
+        print('ERROR: %s' % e, file=sys.stderr)
+        print('  Unable to load the flup package.  In order to run rsted', file=sys.stderr)
+        print('  as a FastCGI application, you will need to get flup from', file=sys.stderr)
+        print("  http://www.saddi.com/software/flup/   If you've already", file=sys.stderr)
+        print('  installed flup, then make sure you have it in your PYTHONPATH.', file=sys.stderr)
         return False
 
     flup_module = 'server.' + options['protocol']
@@ -141,7 +141,7 @@ def runfastcgi(app, argset=[], **kwargs):
     wsgi_opts['debug'] = options['debug'] is not None
 
     try:
-        module = importlib.import_module('.%s' % flup_module, 'flup')
+        module = importlib.import_module('flup.%s' % flup_module, 'flup')
         #WSGIServer = module.WSGIServer
         class WSGIServer(module.WSGIServer):
 
@@ -154,7 +154,7 @@ def _spawnChild(self, sock):
                 return super(WSGIServer, self)._spawnChild(sock)
 
     except:
-        print "Can't import flup." + flup_module
+        print("Can't import flup." + flup_module)
         return False
 
     if options['host'] and options['port'] and not options['socket']:

diff --git a/pwl/utils/daemon.py b/pwl/utils/daemon.py
@@ -53,7 +53,7 @@ def delpid(self):
                 os.unlink(self.pidfile)
             except:
                 pass
-    
+
     def readpid(self):
         try:
             with open(self.pidfile, 'r') as pf:
@@ -84,7 +84,7 @@ def stop(self):
 
         # Get the pid from the pidfile
         pid = self.readpid()
-        
+
         if not pid:
             message = 'pidfile %s does not exist. Daemon not running?\n' % self.pidfile
             sys.stderr.write(message)
@@ -95,7 +95,7 @@ def stop(self):
             while 1:
                 os.kill(pid, signal.SIGTERM)  # @UndefinedVariable
                 time.sleep(0.1)
-        except OSError, err:
+        except OSError as err:
             error_code = getattr(err, 'code', err.errno)
             if error_code == errno.ESRCH:  # No such process
                 self.delpid()

diff --git a/pwl/utils/daemonize.py b/pwl/utils/daemonize.py
@@ -3,7 +3,7 @@
 import sys
 import signal
 
-def become_daemon(our_home_dir='.', out_log='/dev/null', err_log='/dev/null', umask=022):
+def become_daemon(our_home_dir='.', out_log='/dev/null', err_log='/dev/null', umask=0o22):
     '''Robustly turn into a UNIX daemon, running in our_home_dir.'''
 
     #  On some systems, the fork() system call resets some of the
@@ -15,7 +15,7 @@ def become_daemon(our_home_dir='.', out_log='/dev/null', err_log='/dev/null', um
     try:
         if os.fork() > 0:
             sys.exit(0)  # kill off parent
-    except OSError, e:
+    except OSError as e:
         sys.stderr.write('fork #1 failed: (%d) %s\n' % (e.errno, e.strerror))
         sys.exit(1)
     os.setsid()
@@ -26,14 +26,14 @@ def become_daemon(our_home_dir='.', out_log='/dev/null', err_log='/dev/null', um
     try:
         if os.fork() > 0:
             os._exit(0)
-    except OSError, e:
+    except OSError as e:
         sys.stderr.write('fork #2 failed: (%d) %s\n' % (e.errno, e.strerror))
         os._exit(1)
 
     signal.signal(signal.SIGUSR1, usr1)
     si = open('/dev/null', 'r')
-    so = open(out_log, 'a+', 0)
-    se = open(err_log, 'a+', 0)
+    so = open(out_log, 'a+b', 0)
+    se = open(err_log, 'a+b', 0)
     os.dup2(si.fileno(), sys.stdin.fileno())
     os.dup2(so.fileno(), sys.stdout.fileno())
     os.dup2(se.fileno(), sys.stderr.fileno())

diff --git a/rsted.fcgi b/rsted.fcgi
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 import os
 from os.path import join as J

diff --git a/rsted/pdf.py b/rsted/pdf.py
@@ -1,17 +1,22 @@
+import sys
 from rst2pdf.createpdf import RstToPdf
 import codecs
 utf8codec = codecs.lookup('utf-8')
 
 from flask import current_app
 
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
+if sys.version_info > (3,):
+    #from io import StringIO
+    from io import BytesIO
+else:
+    try:
+        from cStringIO import StringIO as BytesIO
+    except ImportError:
+        from StringIO import StringIO as BytesIO
 
 def rst2pdf(content, theme=None):
     topdf = RstToPdf(basedir=current_app.config.root_path, breaklevel=0)
-    buf = StringIO()
+    buf = BytesIO()
 
     if not content:
         content = '\0'

diff --git a/settings.py b/settings.py
@@ -1,7 +1,7 @@
 import os
 
 # configuration
-DEBUG = not os.environ.has_key('RSTED_PROD')
+DEBUG = 'RSTED_PROD' not in os.environ
 
 RUN_PATH = 'var/run'
 PID_FILE = 'fastcgi.pid'

diff --git a/templates/about.html b/templates/about.html
@@ -3,8 +3,8 @@
 {% block content %}
 
 <p>
-Site uses standard rst2html.py script</br>
-Site source: <a href="http://github.com/anru/rsted">http://github.com/anru/rsted</a>
+This site uses standard rst2html.py script</br>
+Source code to this site: <a href="https://github.com/destrangis/rsted">https://github.com/destrangis/rsted</a>
 </p>
 
 

diff --git a/templates/base.html b/templates/base.html
@@ -5,18 +5,18 @@
         <meta charset="UTF-8">
         <title>{% block title %}Online reStructuredText editor{% endblock %}</title>
 
-	<link rel="stylesheet" href="{{ request.script_root }}{{ MEDIA_URL }}style/base.css"/>
-	<link rel="stylesheet" href="{{ request.script_root }}{{ MEDIA_URL }}style/site.css"/>
-	<link rel="stylesheet" href="{{ request.script_root }}{{ MEDIA_URL }}style/menu.css"/>
+    <link rel="stylesheet" href="{{ request.script_root }}{{ MEDIA_URL }}style/base.css"/>
+    <link rel="stylesheet" href="{{ request.script_root }}{{ MEDIA_URL }}style/site.css"/>
+    <link rel="stylesheet" href="{{ request.script_root }}{{ MEDIA_URL }}style/menu.css"/>
 
 
-	<script src="{{ request.script_root }}{{ MEDIA_URL }}scripts/jquery-1.6.4.min.js"></script>
-	<script src="{{ request.script_root }}{{ MEDIA_URL }}scripts/jquery.layout.min-1.2.0.js"></script>
+    <script src="{{ request.script_root }}{{ MEDIA_URL }}scripts/jquery-1.6.4.min.js"></script>
+    <script src="{{ request.script_root }}{{ MEDIA_URL }}scripts/jquery.layout.min-1.2.0.js"></script>
 
         {% endblock %}
     </head>
     <body>
-        <a id="github-ribbon" href="http://github.com/anru/rsted">Fork me on GitHub</a>
+        <a id="github-ribbon" href="http://github.com/destrangis/rsted">Fork me on GitHub</a>
         {% block body_head %}
         {% endblock %}
         <header id="header">