Mercurial > code > home > repos > light9

changeset 1861:40cc863d2b63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
start py3 and other dep fixes Ignore-this: f43a792107c9640a01d35c080b0ee87d
author drewp@bigasterisk.com
date Fri, 24 May 2019 05:58:52 +0000
parents 5bcb950024af
children d92757c88817
files bin/ascoltami2 bin/captureDevice bin/collector bin/effecteval bin/paintserver bin/run_local.py bin/subserver bin/vidrefsetup lib/cycloneerr.py light9/ascoltami/player.py light9/ascoltami/webapp.py light9/curvecalc/curveedit.py light9/showconfig.py light9/subcomposer/subcomposerweb.py requirements.txt
diffstat 15 files changed, 27 insertions(+), 74 deletions(-) [+]
line wrap: on
line diff
--- a/bin/ascoltami2	Wed May 22 00:09:13 2019 +0000
+++ b/bin/ascoltami2	Fri May 24 05:58:52 2019 +0000
@@ -3,9 +3,6 @@
 from twisted.internet import reactor
 import web, _thread, sys, optparse, logging
 from rdflib import URIRef
-sys.path.append(".")
-sys.path.append('/usr/lib/python2.7/dist-packages')  # For gi
-
 import gi
 gi.require_version('Gst', '1.0')
 gi.require_version('Gtk', '3.0')
--- a/bin/captureDevice	Wed May 22 00:09:13 2019 +0000
+++ b/bin/captureDevice	Fri May 24 05:58:52 2019 +0000
@@ -13,7 +13,7 @@
 from greplin import scales
 
 from run_local import log
-from lib.cycloneerr import PrettyErrorHandler
+from cycloneerr import PrettyErrorHandler
 
 from light9.namespaces import L9, RDF
 from light9 import networking, showconfig
--- a/bin/collector	Wed May 22 00:09:13 2019 +0000
+++ b/bin/collector	Fri May 24 05:58:52 2019 +0000
@@ -20,7 +20,7 @@
 import cyclone.web, cyclone.websocket
 from greplin import scales
 
-from lib.cycloneerr import PrettyErrorHandler
+from cycloneerr import PrettyErrorHandler
 from light9.collector.output import EnttecDmx, Udmx, DummyOutput
 from light9.collector.collector import Collector
 from light9.namespaces import L9
--- a/bin/effecteval	Wed May 22 00:09:13 2019 +0000
+++ b/bin/effecteval	Fri May 24 05:58:52 2019 +0000
@@ -19,7 +19,7 @@
 from rdfdb.syncedgraph import SyncedGraph
 from greplin import scales
 
-from lib.cycloneerr import PrettyErrorHandler
+from cycloneerr import PrettyErrorHandler
 
 
 class EffectEdit(PrettyErrorHandler, cyclone.web.RequestHandler):
--- a/bin/paintserver	Wed May 22 00:09:13 2019 +0000
+++ b/bin/paintserver	Fri May 24 05:58:52 2019 +0000
@@ -12,7 +12,7 @@
 from rdflib import URIRef
 from light9 import clientsession
 import light9.paint.solve
-from lib.cycloneerr import PrettyErrorHandler
+from cycloneerr import PrettyErrorHandler
 from light9.namespaces import RDF, L9, DEV
 import imp
 
--- a/bin/run_local.py	Wed May 22 00:09:13 2019 +0000
+++ b/bin/run_local.py	Fri May 24 05:58:52 2019 +0000
@@ -8,49 +8,21 @@
 def fixSysPath():
     root = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]),
                                         '..')) + '/'
-
-    # this is site-packages/zope.interface-4.5.0-py2.7-nspkg.pth,
-    # slightly edited.
-    import types
-    has_mfs = sys.version_info > (3, 5)
-    p = root + 'env/local/lib/python2.7/site-packages/zope'
-    importlib = has_mfs and __import__('importlib.util')
-    has_mfs and __import__('importlib.machinery')
-    m = has_mfs and sys.modules.setdefault(
-        'zope',
-        importlib.util.module_from_spec(
-            importlib.machinery.PathFinder.find_spec('zope',
-                                                     [os.path.dirname(p)])))
-    m = m or sys.modules.setdefault('zope', types.ModuleType('zope'))
-    mp = (m or []) and m.__dict__.setdefault('__path__', [])
-    (p not in mp) and mp.append(p)
-
-    p = root + 'env/local/lib/python2.7/site-packages/greplin'
-    importlib = has_mfs and __import__('importlib.util')
-    has_mfs and __import__('importlib.machinery')
-    m = has_mfs and sys.modules.setdefault(
-        'greplin',
-        importlib.util.module_from_spec(
-            importlib.machinery.PathFinder.find_spec('greplin',
-                                                     [os.path.dirname(p)])))
-    m = m or sys.modules.setdefault('greplin', types.ModuleType('greplin'))
-    mp = (m or []) and m.__dict__.setdefault('__path__', [])
-    (p not in mp) and mp.append(p)
-
     sys.path = [
         root,
-        root + 'env/lib/python2.7',
-        root + 'env/lib/python2.7/plat-x86_64-linux-gnu',
-        root + 'env/lib/python2.7/lib-tk',
-        root + 'env/lib/python2.7/lib-old',
-        root + 'env/lib/python2.7/lib-dynload',
-        '/usr/lib/python2.7',
-        '/usr/lib/python2.7/plat-x86_64-linux-gnu',
-        '/usr/lib/python2.7/lib-tk',
-        root + 'env/local/lib/python2.7/site-packages',
-        root + 'env/local/lib/python2.7/site-packages/gtk-2.0',
-        root + 'env/lib/python2.7/site-packages',
-        root + 'env/lib/python2.7/site-packages/gtk-2.0',
+        root + 'env/lib/python3.7',
+        root + 'env/lib/python3.7/plat-x86_64-linux-gnu',
+        root + 'env/lib/python3.7/lib-tk',
+        root + 'env/lib/python3.7/lib-old',
+        root + 'env/lib/python3.7/lib-dynload',
+        '/usr/lib/python3/dist-packages/',
+        '/usr/lib/python3.7',
+#        '/usr/lib/python3.7/plat-x86_64-linux-gnu',
+#        '/usr/lib/python3.7/lib-tk',
+#        root + 'env/local/lib/python3.7/site-packages',
+#        root + 'env/local/lib/python3.7/site-packages/gtk-2.0',
+        root + 'env/lib/python3.7/site-packages',
+#        root + 'env/lib/python3.7/site-packages/gtk-2.0',
     ]
 
 
--- a/bin/subserver	Wed May 22 00:09:13 2019 +0000
+++ b/bin/subserver	Fri May 24 05:58:52 2019 +0000
@@ -15,7 +15,7 @@
 from light9.namespaces import L9, DCTERMS
 from light9 import networking, showconfig
 
-from lib.cycloneerr import PrettyErrorHandler
+from cycloneerr import PrettyErrorHandler
 
 
 class Static(PrettyErrorHandler, cyclone.web.StaticFileHandler):
--- a/bin/vidrefsetup	Wed May 22 00:09:13 2019 +0000
+++ b/bin/vidrefsetup	Fri May 24 05:58:52 2019 +0000
@@ -14,7 +14,7 @@
 from light9.namespaces import L9, DCTERMS
 from light9 import networking, showconfig
 
-from lib.cycloneerr import PrettyErrorHandler
+from cycloneerr import PrettyErrorHandler
 
 
 class RedirToCamera(PrettyErrorHandler, cyclone.web.RequestHandler):
--- a/lib/cycloneerr.py	Wed May 22 00:09:13 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-import httplib, cgi
-
-class PrettyErrorHandler(object):
-    """
-    mix-in to improve cyclone.web.RequestHandler
-    """
-    def get_error_html(self, status_code, **kwargs):
-        try:
-            tb = kwargs['exception'].getTraceback()
-        except AttributeError:
-            tb = ""
-        return "<html><title>%(code)d: %(message)s</title>" \
-               "<body>%(code)d: %(message)s<pre>%(tb)s</pre></body></html>" % {
-            "code": status_code,
-            "message": httplib.responses[status_code],
-            "tb" : cgi.escape(tb),
-        }
--- a/light9/ascoltami/player.py	Wed May 22 00:09:13 2019 +0000
+++ b/light9/ascoltami/player.py	Fri May 24 05:58:52 2019 +0000
@@ -131,7 +131,7 @@
         log.info("preloading %s", songPath)
         assert songPath.startswith("file://"), songPath
         try:
-            open(songPath[len("file://"):]).read()
+            open(songPath[len("file://"):], 'rb').read()
         except IOError as e:
             log.error("couldn't preload %s, %r", songPath, e)
             raise
--- a/light9/ascoltami/webapp.py	Wed May 22 00:09:13 2019 +0000
+++ b/light9/ascoltami/webapp.py	Fri May 24 05:58:52 2019 +0000
@@ -7,7 +7,7 @@
 from web.contrib.template import render_genshi
 render = render_genshi([sibpath(__file__, ".")], auto_reload=True)
 
-from lib.cycloneerr import PrettyErrorHandler
+from cycloneerr import PrettyErrorHandler
 
 _songUris = {}  # locationUri : song
 
@@ -109,7 +109,7 @@
         graph = self.settings.app.graph
 
         self.settings.app.player.setSong(
-            songLocation(graph, URIRef(self.request.body)))
+            songLocation(graph, URIRef(self.request.body.decode('utf8'))))
         self.set_header("Content-Type", "text/plain")
         self.write("ok")
 
--- a/light9/curvecalc/curveedit.py	Wed May 22 00:09:13 2019 +0000
+++ b/light9/curvecalc/curveedit.py	Fri May 24 05:58:52 2019 +0000
@@ -5,7 +5,7 @@
 from twisted.internet import reactor
 import cyclone.web, cyclone.httpclient, cyclone.websocket
 from rdflib import URIRef
-from lib.cycloneerr import PrettyErrorHandler
+from cycloneerr import PrettyErrorHandler
 from run_local import log
 from louie import dispatcher
 
--- a/light9/showconfig.py	Wed May 22 00:09:13 2019 +0000
+++ b/light9/showconfig.py	Fri May 24 05:58:52 2019 +0000
@@ -33,7 +33,7 @@
     """Return the show URI associated with $LIGHT9_SHOW."""
     global _showUri
     if _showUri is None:
-        _showUri = URIRef(file(path.join(root(), 'URI')).read().strip())
+        _showUri = URIRef(open(path.join(root(), 'URI')).read().strip())
     return _showUri
 
 def songOnDisk(song):
--- a/light9/subcomposer/subcomposerweb.py	Wed May 22 00:09:13 2019 +0000
+++ b/light9/subcomposer/subcomposerweb.py	Fri May 24 05:58:52 2019 +0000
@@ -1,6 +1,6 @@
 import logging
 import cyclone.web, cyclone.websocket, cyclone.httpclient
-from lib.cycloneerr import PrettyErrorHandler
+from cycloneerr import PrettyErrorHandler
 from light9 import networking
 from rdflib import URIRef, Literal
 from twisted.internet import reactor
--- a/requirements.txt	Wed May 22 00:09:13 2019 +0000
+++ b/requirements.txt	Fri May 24 05:58:52 2019 +0000
@@ -35,6 +35,7 @@
 git+http://github.com/webpy/webpy@ace0f8954c28311004b33c7a513c6e40a3c02470#egg=web
 https://github.com/drewp/cyclone/archive/python3.zip#egg=cyclone
 
-rdfdb==0.8.0
+cycloneerr==0.3.0
+rdfdb==0.11.0