New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes genome decode handling. #5198

Merged
merged 2 commits into from Dec 12, 2017

Conversation

Projects
None yet
4 participants
@dannon
Member

dannon commented Dec 12, 2017

dbkey is either unicode or str here variously, and the previous change in daa973a broke the case where it was unicode.

Fixes genome decode handling. dbkey was either unicode or str here va…
…riously, and the previous change broke the case where it was unicode.
@@ -26,7 +26,7 @@
def decode_dbkey(dbkey):
""" Decodes dbkey and returns tuple ( username, dbkey )"""
if isinstance(dbkey, str) and ':' in dbkey:
if isinstance(dbkey, basestring) and ':' in dbkey:

This comment has been minimized.

@nsoranzo

nsoranzo Dec 12, 2017

Member

Can you please use six.string_types instead for Python3 compatibility?

This comment has been minimized.

@dannon

dannon Dec 12, 2017

Member

Sure.

@galaxybot galaxybot added this to the 18.01 milestone Dec 12, 2017

@jmchilton jmchilton merged commit d84fd95 into galaxyproject:dev Dec 12, 2017

5 of 6 checks passed

selenium test Test started.
Details
api test Build finished. 334 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 165 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 60 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 577 tests run, 0 skipped, 0 failed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment