Skip to content
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.

Sign up for GitHub

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

safely convert ini parameters to bool, int, list and dict #104

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

safely convert ini parameters to bool, int, list and dict #104

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3d49b8d
safely convert ini parameters to bool and int
kkvilekval Mar 20, 2024
1855c90
added gitlab-ci
kkvilekval Mar 20, 2024
2daf286
bump-version
kkvilekval Mar 20, 2024
04482bb
uses stages
kkvilekval Mar 20, 2024
d69eb19
Update .gitlab-ci.yml file
kkvilekval Mar 20, 2024
398b9d1
typo
kkvilekval Mar 20, 2024
01f883a
bump version; user build
kkvilekval Mar 20, 2024
16c4dd8
install build
kkvilekval Mar 20, 2024
38ed887
added json5 decoding for structures
kkvilekval May 22, 2024
8bcc9f0
bump version
kkvilekval May 22, 2024
62110dc
use ast literal_eval
kkvilekval May 23, 2024
80863e8
version bump
kkvilekval May 24, 2024
c33729e
remove redundant converstion
kkvilekval Jul 20, 2024
ee3042d
catch all ast errors
kkvilekval Jul 23, 2024
37d6880
bump
kkvilekval Jul 23, 2024
656744f
parens about exc
kkvilekval Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pyramid_celery/loaders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import datetime
import json
import pyjson5 as json5
from pyjson5 import Json5DecoderException as JSONDecodeError
import celery.loaders.base
import celery.schedules
import configparser
Expand Down Expand Up @@ -93,6 +95,13 @@ def get_route_config(parser, section):

def safe_conversion(value):
"""convert a string to a more specific type"""
try:
newval= json5.loads(value)
#print("JSON DECODED", type(newval), newval)
return newval
except JSONDecodeError:
pass
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably try using json.load as fallback if pyjson5 is not installed.
The imports should also handle missing pyjson5 from installed packages.
I don't think it is necessary for pyramid_celery to inject this new dependency.


if value.lower() in ("true", "false"):
return bool(value)
try:
Expand Down