webpyapp: réorganiser les fichiers pour supporter des librairies locales

2017-07-20 09:13:51 +04:00 · 2017-07-20 09:13:51 +04:00 · 65bd363a13
parent 0b39b2324b
commit 65bd363a13
24 changed files with 8 additions and 6 deletions
--- a/lib/ulib/templates/webpyapp/.gitignore
+++ b/lib/ulib/templates/webpyapp/.gitignore
@ -0,0 +1 @@
+*.py[co]
--- a/lib/ulib/templates/webpyapp/lib/python/init.py
+++ b/lib/ulib/templates/webpyapp/lib/python/init.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/init.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/init.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/client/init.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/client/init.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/client/fcgi_app.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/client/fcgi_app.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/client/scgi_app.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/client/scgi_app.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/init.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/init.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/ajp.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/ajp.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/ajp_base.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/ajp_base.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/ajp_fork.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/ajp_fork.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/cgi.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/cgi.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/fcgi.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/fcgi.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/fcgi_base.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/fcgi_base.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/fcgi_fork.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/fcgi_fork.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/fcgi_single.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/fcgi_single.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/paste_factory.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/paste_factory.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/preforkserver.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/preforkserver.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/scgi.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/scgi.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/scgi_base.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/scgi_base.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/scgi_fork.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/scgi_fork.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/singleserver.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/singleserver.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/threadedserver.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/threadedserver.py
--- a/lib/ulib/templates/webpyapp/lib/python/flup/server/threadpool.py
+++ b/lib/ulib/templates/webpyapp/lib/python/flup/server/threadpool.py
--- a/lib/ulib/templates/webpyapp/server.py
+++ b/lib/ulib/templates/webpyapp/server.py
@ -3,6 +3,12 @@

 __all__ = ('Server',)

+import sys, os
+from os import path
+
+SCRIPTDIR = path.abspath(path.split(__file__)[0])
+sys.path.insert(0, path.join(SCRIPTDIR, 'lib/python'))
+
 from ulib.web import web, Application, Page, defaults

 class Server(Application):
@ -17,9 +23,4 @@ class index(Page):
    PREFIX = r'/'

 if __name__ == '__main__':
-    import sys
-    from os import path
-
-    basedir = path.abspath(path.split(__file__)[0])
-    sys.path.append(path.join(basedir, 'lib'))
-    Server(basedir).run(sys.argv[1:])
+    Server(SCRIPTDIR).run(sys.argv[1:])