light9 Changeset - 40cc863d2b63

Changeset - 40cc863d2b63

Parent rev.

Child rev.

[Not reviewed]

default

1 14 0

drewp@bigasterisk.com - 6 years ago 2019-05-24 05:58:52
drewp@bigasterisk.com

start py3 and other dep fixes
Ignore-this: f43a792107c9640a01d35c080b0ee87d

15 files changed with 27 insertions and 74 deletions:

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

0 comments (0 inline, 0 general)

bin/ascoltami2

➞

Show inline comments

@@ @@ -3,9 +3,6 @@ from run_local import log @@
 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')

bin/captureDevice

➞

Show inline comments

@@ @@ -13,7 +13,7 @@ import cyclone.web, cyclone.websocket, c @@
 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

bin/collector

➞

Show inline comments

@@ @@ -20,7 +20,7 @@ import traceback @@
 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

bin/effecteval

➞

Show inline comments

@@ @@ -19,7 +19,7 @@ from rdfdb.patch import Patch @@
 from rdfdb.syncedgraph import SyncedGraph
 from greplin import scales
-from lib.cycloneerr import PrettyErrorHandler
 from cycloneerr import PrettyErrorHandler
 class EffectEdit(PrettyErrorHandler, cyclone.web.RequestHandler):

bin/paintserver

➞

Show inline comments

@@ @@ -12,7 +12,7 @@ import cyclone.web @@
 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

bin/run_local.py

➞

Show inline comments

@@ @@ -8,49 +8,21 @@ import sys, os, socket @@
 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',
+    ]

bin/subserver

➞

Show inline comments

@@ @@ -15,7 +15,7 @@ from rdfdb.patch import Patch @@
 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):

bin/vidrefsetup

➞

Show inline comments

@@ @@ -14,7 +14,7 @@ from rdfdb.patch import Patch @@
 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):

lib/cycloneerr.py

➞

Show inline comments

deleted file

light9/ascoltami/player.py

➞

Show inline comments

@@ @@ -131,7 +131,7 @@ class Player(object): @@
         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

light9/ascoltami/webapp.py

➞

Show inline comments

@@ @@ -7,7 +7,7 @@ from rdflib import URIRef @@
 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 @@ class songResource(PrettyErrorHandler, c @@
         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")

light9/curvecalc/curveedit.py

➞

Show inline comments

@@ @@ -5,7 +5,7 @@ import cgi, time @@
 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

light9/showconfig.py

➞

Show inline comments

@@ @@ -33,7 +33,7 @@ def showUri(): @@
     """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):

light9/subcomposer/subcomposerweb.py

➞

Show inline comments

 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

requirements.txt

➞

Show inline comments

@@ @@ -35,6 +35,7 @@ git+http://github.com/11craft/louie.git@ @@
 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

0 comments (0 inline, 0 general)