Greg Von Kuster avatar Greg Von Kuster committed 33db192

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

Comments (0)

Files changed (2)

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 ):

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 ) ):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.