← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/fileservice/__init__.py

  • Committer: William Grant
  • Date: 2009-04-28 08:17:26 UTC
  • Revision ID: grantw@unimelb.edu.au-20090428081726-7h8fyjclxtydjma0
No more ivle.conf in ivle.webapp.fileservice...

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/fileservice/__init__.py
30
30
 
31
31
import os.path
32
32
 
33
 
import ivle.conf
34
33
import ivle.interpret
35
34
from ivle.webapp.base.views import BaseView
36
35
from ivle.webapp.base.plugins import ViewPlugin
37
36
 
38
 
fileservice_path = os.path.join(ivle.conf.share_path, 'services/fileservice')
39
 
 
40
37
# XXX: Writes to req directly. This is a direct port of the legacy version.
41
38
#      This needs to be rewritten soon.
42
39
 
56
53
                                                          req.user.login)))
57
54
 
58
55
        interp_object = ivle.interpret.interpreter_objects["cgi-python"]
59
 
        user_jail_dir = os.path.join(ivle.conf.jail_base, req.user.login)
 
56
        user_jail_dir = os.path.join(req.config['paths']['jails']['mounts'],
 
57
                                     req.user.login)
 
58
 
60
59
        ivle.interpret.interpret_file(req, req.user, user_jail_dir,
61
 
            fileservice_path, interp_object, gentle=False)
 
60
                                  os.path.join(req.config['paths']['share'],
 
61
                                               'services/fileservice'),
 
62
                                  interp_object, gentle=False)
62
63
 
63
64
class Plugin(ViewPlugin):
64
65
    urls = [