commit/galaxy-central: greg: Handle weak Python 2.5 unicode string handling in the tool shed.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/33db1925e701/ changeset: 33db1925e701 user: greg date: 2012-10-23 22:52:25 summary: Handle weak Python 2.5 unicode string handling in the tool shed. affected #: 2 files diff -r 70ae646e6892e7bb5a05500c99b4cfcc22495a37 -r 33db1925e701664785735160f3738dfde97fc2e6 lib/galaxy/tool_shed/install_manager.py --- a/lib/galaxy/tool_shed/install_manager.py +++ b/lib/galaxy/tool_shed/install_manager.py @@ -50,7 +50,7 @@ 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 ): diff -r 70ae646e6892e7bb5a05500c99b4cfcc22495a37 -r 33db1925e701664785735160f3738dfde97fc2e6 lib/galaxy/util/shed_util.py --- a/lib/galaxy/util/shed_util.py +++ b/lib/galaxy/util/shed_util.py @@ -685,7 +685,7 @@ 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 ) ): Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
Bitbucket