aboutsummaryrefslogtreecommitdiff
path: root/wqflask/utility
AgeCommit message (Collapse)Author
2021-02-18Changed authentication_tools.py to account for encoding str as bytes and ↵zsloan
dealing with the permissions response either being a list or not a list (this should be temporary until I figure out what is going on here)
2021-02-17Fixed error caused by user IDs being encoded as byteszsloan
2021-01-06replace vars with vars_obj which is a function name in pythonAlexanderkabui
2020-12-18Added redirect_uri to the ORCID_AUTH_URL since it wasn't working due to ↵zsloan
missing this parameter
2020-11-02Created function for encoding the column value as bytes when fetching from ↵zsloan
the JSON-formatted string pulled from Redis (since this was needed after the Python 3 switchover) * wqflask/utility/redis_tools.py - Created function load_json_from_redis that encodes the key (column_value) when fetching a value from the JSON pulled from Redis
2020-10-28Use latin-1 encoding when converting hmac secret to bytesBonfaceKilz
* wqflask/utility/hmac.py (hmac_creation): Use latin-1 when serializing the hmac secret. This ensures that the behaviour of *verify_cookie* remains the same as in the python2 tip.
2020-09-26Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-09-18Apply pep8 formattingBonfaceKilz
2020-09-17Replace string arguments to "hmac.new" with bytearrayBonfaceKilz
Same as: https://github.com/genenetwork/genenetwork2/pull/422/commits/46443ec8d2cdfd7c60358a889d90a90e4f7daaf4
2020-09-17Apply pep8BonfaceKilz
* wqflask/base/trait.py: Apply pep8. * wqflask/utility/authentication_tools.py: Ditto.
2020-09-17Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-09-17Apply pep8BonfaceKilz
* wqflask/utility/hmac.py: Apply pep8 and fix typo.
2020-09-16Apply pep8BonfaceKilz
* wqflask/utility/authentication_tools.py: Apply pep8 formatting to file.
2020-09-16Remove unnecessary if branchBonfaceKilz
* wqflask/utility/authentication_tools.py (check_resource_availability): Combine if statements into one boolean check in one if branch.
2020-08-31Remove typo at beginning of lineBonfaceKilz
* wqflask/utility/authentication_tools.py: Remove accidental char at beginning of line.
2020-08-31Fixed issue that was causing updating resource default privileges to notzsloan
work * wqflask/utility/redis_tools.py - There was an issue where resources wouldn't be updated if they already existed. This is because the code didn't yet account for the "update" tag (that is meant to give the option of preventing updating resources when running the script to enter all resources into Redis). I changed the logic to add a resource if "update" is True or the resource doesn't already exist (so it won't if update is False and the resource exists).
2020-08-31Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-08-29Fixed issue where exporting traits would throw an error if a dataset'szsloan
group didn't have an InbredSetCode set in the DB * wqflask/utility/authentication_tools.py - Changed get_group_code to return an empty string instead of None if InbredSetCode doesn't exist for a dataset group * wqflask/wqflask/views.py - Changed zipped export filename to "export_(datetime)" instead of "collection_(datetime)" since this export can occur from both the collection page and the global search page
2020-08-27Add check for empty group_code when adding a new resourceBonfaceKilz
* wqflask/utility/authentication_tools.py(add_new_resource): If group_code is "None", an error is thrown when you try to: `group_code + "_" + str(trait_id)`
2020-08-27Replace string arguments to "hmac.new" with bytearrayBonfaceKilz
See: <https://stackoverflow.com/questions/31848293/python3-and-hmac-how-to-handle-string-not-being-binary>
2020-08-27Add global method to convert binary string to plain stringBonfaceKilz
* wqflask/utility/db_tools.py: escape_string returns a binary string which introduces a bug when composing sql query string. The escaped strings have to be converted to plain text.
2020-08-27Replace "string.split" & "string.join" with python's inbuilt methodsBonfaceKilz
2020-08-26Remove "from __future__ import new_feature" statementsBonfaceKilz
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-future>
2020-08-26Replace calls to "basestring with "str""BonfaceKilz
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-basestring>
2020-08-26Update corestats importBonfaceKilz
* wqflask/utility/Plot.py: import corestats from the utility module.
2020-08-26Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-08-24Remove unused importsBonfaceKilz
* wqflask/utility/Plot.py: Remove unused imports like "numarray". "numarray" is does not have py3 support so it's important to remove references to it.
2020-08-24The function draw_rotated_text_ was writing an image to /tmp, which GN2zsloan
user apparently doesn't have access to, so I replaced it with a link to the dynamically set TEMPDIR * wqflask/utility/pillow_utils.py - Replaced "/tmp/" in image location with TEMPDIR
2020-08-23Use Python3 string methodsBonfaceKilz
* wqflask/utility/webqtlUtil.py (genRandStr): Replace "string.letters" with "string.ascii_letters".
2020-08-20Handle module renames in the standard libraryBonfaceKilz
Run: ``` 2to3-3.8 -f imports -w . && \ 2to3-3.8 -f imports2 -w . ``` See: <https://docs.python.org/2/library/2to3.html#2to3fixer-imports> and <https://docs.python.org/2/library/2to3.html#2to3fixer-imports2>
2020-08-19Remove extra whitespace(or add it) from comma separated itemsBonfaceKilz
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-urllib>
2020-08-19Make Python more idiomaticBonfaceKilz
Run `2to3-3.8 -f idioms -w .` See: <https://docs.python.org/2/library/2to3.html#2to3fixer-idioms>
2020-08-19Rename xrange() to range() and wrap existing range() calls with listBonfaceKilz
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-xrange>
2020-08-19Wrap `raise` statements in parenthesisBonfaceKilz
Run `2to3-3.8 -f raise -w .` See: <https://docs.python.org/2/library/2to3.html#2to3fixer-raise>
2020-08-19Convert the old not-equal syntax, <>, to !=BonfaceKilz
Run `2to3-3.8 -f ne -w .` See: <https://docs.python.org/2/library/2to3.html#2to3fixer-ne>
2020-08-19Fix dictionary iteration methodsBonfaceKilz
Run `2to3-3.8 -f dict -w .` See: <https://docs.python.org/2/library/2to3.html#2to3fixer-dict> and <https://stackoverflow.com/questions/17695456/why-does-python-3-need-dict-items-to-be-wrapped-with-list>
2020-08-19Remove erroneous `if .. else` branchBonfaceKilz
* wqflask/utility/svg.py [roct, ellipse, SVGelement]: Raise only a single value error if either height or width is not defined. Fixes parsing error when running `2to3-3.8 -f apply -w .`
2020-08-19Wrap `map()` in a `list` callBonfaceKilz
Run `2to3-3.8 -f map -w .` See: <https://docs.python.org/2/library/2to3.html#2to3fixer-map>
2020-08-18Apply pep8BonfaceKilz
* wqflask/utility/svg.py: Apply pep8 to fix indentation error when running `2to3-3.8 -w .`: ```` RefactoringTool: Can't parse ./wqflask/utility/svg.py: IndentationError: unindent does not match any outer indentation level (<tokenize>, line 403) ````
2020-08-18Replace "<>" with "!="BonfaceKilz
* wqflask/utility/svg.py: Use "!=". The operator, "<>" is removed in Python3
2020-08-18Wrap print statements in parenthesesBonfaceKilz
2020-08-18Fix malformed docstringBonfaceKilz
* wqflask/utility/Plot.py: Update docstring.
2020-08-08Add draw_open_polygon() utilityMuriithi Frederick Muriuki
* wqflask/utility/pillow_utils.py: New method.
2020-08-08Use draw_rotated_text()Muriithi Frederick Muriuki
Use the new draw_rotated_text() function to draw the text rotated as was formerly done. * wqflask/utility/Plot.py (plotBar): Use draw_rotated_text(). * wqflask/wqflask/marker_regression/display_mapping_results.py: (DisplayMappingResults) Use draw_rotated_text().
2020-08-08Create new utility module for drawingMuriithi Frederick Muriuki
* wqflask/utility/pillow_utils.py: Create a module to hold some utility functions for drawing with Pillow. Initialise the module with a function to draw rotated text.
2020-08-08Fix font pathsMuriithi Frederick Muriuki
* wqflask/utility/Plot.py: Update font paths. * wqflask/fonts/ttf: Update font files.
2020-08-08Migrate code from Piddle to PillowMuriithi Frederick Muriuki
* wqflask/wqflask/marker_regression/display_mapping_results.py: Add font files (DisplayMappingResults): Update the code from the Piddle way of things to the Pillow way of things, for example, replace: - pid.drawRect(...) with im_drawer.rectangle(...) - pid.drawString(...) with im_drawer.text(...) - pid.drawPolygon(...) with im_drawer.polygon(...) etc. * wqflask/utility/Plot.py: Migrate code from the older, unsupported Piddle to the newer Pillow library.
2020-07-29Fixed error that occured for new resources in check_adminzsloan
* wqflask/utility/authentication_tools.py: the code forgot to get resource_info when a resource wasn't in Redis yet, causing an error when it was referenced, so I added a line getting the resource info (and also a couple comments for other lines related to authentication)
2020-07-25The variable is never defined, so let's default to "none"Pjotr Prins
2020-07-24Merge pull request #409 from BonfaceKilz/Build/add-testszsloan
Build/add tests