nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust how modules are imported

Browse Source 
* change to u. notation for util, since from foo import * is evil
 * make import vendor.foo possible
 * vendor dir is part of the repo now, no need to mkdir
 * use the vendor.foo notation
This commit is contained in:
James Vasile 2013-02-09 12:35:08 -05:00
parent 3c7aa32c5b
commit 1ddf4bede4
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -51,7 +51,6 @@ data/users.sqlite3: data/users.sqlite3.distrib
dirs: dirs:
@mkdir -p data/cherrypy_sessions @mkdir -p data/cherrypy_sessions
@mkdir -p vendor
config: Makefile config: Makefile
@test -f plinth.config || cp plinth.sample.config plinth.config @test -f plinth.config || cp plinth.sample.config plinth.config

11
plinth.py
View File

@ -12,14 +12,13 @@ from cherrypy.process.plugins import Daemonizer
Daemonizer(cherrypy.engine).subscribe() Daemonizer(cherrypy.engine).subscribe()
import plugin_mount import plugin_mount
from util import * import util as u
from logger import Logger from logger import Logger
#from modules.auth import AuthController, require, member_of, name_is #from modules.auth import AuthController, require, member_of, name_is
import withsqlite from vendor.withsqlite.withsqlite import sqlite_db
from withsqlite.withsqlite import sqlite_db from vendor.exmachina.exmachina import ExMachinaClient
import exmachina
from exmachina.exmachina import ExMachinaClient
import socket import socket
__version__ = "0.2.14" __version__ = "0.2.14"
@ -31,7 +30,7 @@ __email__ = "james@jamesvasile.com"
__status__ = "Development" __status__ = "Development"
def error_page(status, dynamic_msg, stock_msg): def error_page(status, dynamic_msg, stock_msg):
return page_template(template="err", title=status, main="<p>%s</p>%s" % (dynamic_msg, stock_msg)) return u.page_template(template="err", title=status, main="<p>%s</p>%s" % (dynamic_msg, stock_msg))
def error_page_404(status, message, traceback, version): def error_page_404(status, message, traceback, version):
return error_page(status, message, """<p>If you believe this return error_page(status, message, """<p>If you believe this

0
vendor/__init__.py vendored Normal file
View File