Commits

Greg Von Kuster  committed 33db192

Handle weak Python 2.5 unicode string handling in the tool shed.

  • Participants
  • Parent commits 70ae646

Comments (0)

Files changed (2)

File lib/galaxy/tool_shed/install_manager.py

                         break
             if found:
                 break      
-        full_path = os.path.abspath( os.path.join( root, name ) )
+        full_path = str( os.path.abspath( os.path.join( root, name ) ) )
         tool = self.toolbox.load_tool( full_path )
         return generate_tool_guid( repository_clone_url, tool )
     def get_proprietary_tool_panel_elems( self, latest_tool_migration_script_number ):

File lib/galaxy/util/shed_util.py

                     metadata_dict[ 'readme' ] = relative_path_to_readme
                 # See if we have a tool config.
                 elif name not in NOT_TOOL_CONFIGS and name.endswith( '.xml' ):
-                    full_path = os.path.abspath( os.path.join( root, name ) )
+                    full_path = str( os.path.abspath( os.path.join( root, name ) ) )
                     if os.path.getsize( full_path ) > 0:
                         if not ( check_binary( full_path ) or check_image( full_path ) or check_gzip( full_path )[ 0 ]
                                  or check_bz2( full_path )[ 0 ] or check_zip( full_path ) ):