Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gyuricska Milán
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
10db4cc6
authored
Jul 29, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
common: add messages for humanreadablex
parent
7bb23000
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
circle/common/models.py
+13
-2
No files found.
circle/common/models.py
View file @
10db4cc6
...
@@ -23,6 +23,7 @@ from logging import getLogger
...
@@ -23,6 +23,7 @@ from logging import getLogger
from
time
import
time
from
time
import
time
from
warnings
import
warn
from
warnings
import
warn
from
django.contrib
import
messages
from
django.contrib.auth.models
import
User
from
django.contrib.auth.models
import
User
from
django.core.cache
import
cache
from
django.core.cache
import
cache
from
django.core.serializers.json
import
DjangoJSONEncoder
from
django.core.serializers.json
import
DjangoJSONEncoder
...
@@ -407,10 +408,17 @@ create_readable = HumanReadableObject.create
...
@@ -407,10 +408,17 @@ create_readable = HumanReadableObject.create
class
HumanReadableException
(
HumanReadableObject
,
Exception
):
class
HumanReadableException
(
HumanReadableObject
,
Exception
):
"""HumanReadableObject that is an Exception so can used in except clause.
"""HumanReadableObject that is an Exception so can used in except clause.
"""
"""
pass
level
=
"error"
def
send_message
(
self
,
request
):
if
request
.
user
and
request
.
user
.
is_superuser
:
msg
=
self
.
get_admin_text
()
else
:
msg
=
self
.
get_user_text
()
getattr
(
messages
,
self
.
level
)(
request
,
msg
)
def
humanize_exception
(
message
,
exception
=
None
,
**
params
):
def
humanize_exception
(
message
,
exception
=
None
,
level
=
None
,
**
params
):
"""Return new dynamic-class exception which is based on
"""Return new dynamic-class exception which is based on
HumanReadableException and the original class with the dict of exception.
HumanReadableException and the original class with the dict of exception.
...
@@ -420,6 +428,9 @@ def humanize_exception(message, exception=None, **params):
...
@@ -420,6 +428,9 @@ def humanize_exception(message, exception=None, **params):
Welcome!
Welcome!
"""
"""
if
level
is
not
None
:
exception
.
level
=
level
Ex
=
type
(
"HumanReadable"
+
type
(
exception
)
.
__name__
,
Ex
=
type
(
"HumanReadable"
+
type
(
exception
)
.
__name__
,
(
HumanReadableException
,
type
(
exception
)),
(
HumanReadableException
,
type
(
exception
)),
exception
.
__dict__
)
exception
.
__dict__
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment