Permalink
Browse files

Minor change to os.path usage. Remove some unused imports.

  • Loading branch information...
jmafc committed Sep 3, 2011
1 parent f24caf2 commit 13838c39429452cf6b16a70b6ed420428ef3f81f
Showing with 4 additions and 6 deletions.
  1. +3 −5 cherrypy/dbapp.py
  2. +1 −1 cherrypy/templating.py
View
@@ -1,8 +1,7 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
-import os
-import cgi
+import os.path
from optparse import OptionParser
import cherrypy
@@ -37,10 +36,9 @@ def error404(status, message, traceback, version):
cherrypy.config.update(
{'error_page.404': error404,
- 'tools.staticdir.root':
- os.path.join(os.path.abspath(os.path.dirname(__file__)),
- 'static'),
'tools.staticdir.on': True,
+ 'tools.staticdir.root': os.path.join(os.path.dirname(
+ os.path.abspath(__file__)), 'static'),
'tools.staticdir.dir': ''})
cherrypy.tree.mount(DatabaseApp(args[0]), '/', 'dbapp.conf')
View
@@ -6,7 +6,7 @@
env = Environment(loader=FileSystemLoader(os.path.join(
- os.path.abspath(os.path.dirname(__file__)), 'templates')))
+ os.path.dirname(os.path.abspath(__file__)), 'templates')))
def render(filename, *args, **data):

0 comments on commit 13838c3

Please sign in to comment.