merging heads

This commit is contained in:
Nate Coraor
2008-12-23 13:28:24 -05:00
2 changed files with 32 additions and 0 deletions
+5
View File
@@ -16,6 +16,11 @@ sys.path = new_path
from galaxy import eggs
import pkg_resources
if 'LOG_TEMPFILES' in os.environ:
from log_tempfile import TempFile
_log_tempfile = TempFile()
import tempfile
pkg_resources.require( "PasteScript" )
from paste.script import command