Revert changesets c79e137850c0 and b471182a3567 because they can break workflows. More thought is needed about how best to deal with non-alphanumeric characters in tool ids, such as those found in EMBOSS tools.

lib/galaxy/tools/__init__.py

@@ -5,7 +5,7 @@ import pkg_resources;
 
 pkg_resources.require( "simplejson" )
 
-import logging, os, string, sys, tempfile, glob, shutil, types, urllib, re
+import logging, os, string, sys, tempfile, glob, shutil, types, urllib
 import simplejson
 import binascii
 from UserDict import DictMixin
@@ -326,9 +326,6 @@ class Tool:
         self.id = root.get( "id" )
         if not self.id: 
             raise Exception, "Missing tool 'id'" 
-        # Sanitize ID so that it has only lowercase characters, numbers, and 
-        # underscores.
-        self.id = re.sub( '[^a-z0-9_]', '_', self.id.lower() )
         self.version = root.get( "version" )
         if not self.version: 
             # For backward compatibility, some tools may not have versions yet.

lib/galaxy/web/controllers/history.py

@@ -493,7 +493,7 @@ class HistoryController( BaseController, Sharable, UsesAnnotations, UsesItemRati
                                 )
                                 
         # Run job to do import.
-        history_imp_tool = trans.app.toolbox.tools_by_id[ '__import_history__' ]
+        history_imp_tool = trans.app.toolbox.tools_by_id[ '__IMPORT_HISTORY__' ]
         incoming = { '__ARCHIVE_SOURCE__' : archive_source, '__ARCHIVE_TYPE__' : archive_type }
         history_imp_tool.execute( trans, incoming=incoming )
         return trans.show_message( "Importing history from '%s'. \
@@ -550,7 +550,7 @@ class HistoryController( BaseController, Sharable, UsesAnnotations, UsesItemRati
                         % ( { 'n' : history.name, 's' : url_for( action="export_archive", id=id, qualified=True ) } ) )
                     
         # Run job to do export.
-        history_exp_tool = trans.app.toolbox.tools_by_id[ '__export_history__' ]
+        history_exp_tool = trans.app.toolbox.tools_by_id[ '__EXPORT_HISTORY__' ]
         params = { 
             'history_to_export' : history, 
             'compress' : gzip,