diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-08-20 12:21:13 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-08-20 12:21:13 -0400 |
| commit | 9e204e49c9670b0e004dc9b62bf3b698b7534325 (patch) | |
| tree | 452eab56add0e1b009b665f5b32d7b59b7545e82 /mediagoblin/processing/__init__.py | |
| parent | e1561d048815e29b3b7c7e1c860d9cf0c4326f0a (diff) | |
| parent | c62d174437445565b55b220396e7571a323a159c (diff) | |
| download | mediagoblin-9e204e49c9670b0e004dc9b62bf3b698b7534325.tar.lz mediagoblin-9e204e49c9670b0e004dc9b62bf3b698b7534325.tar.xz mediagoblin-9e204e49c9670b0e004dc9b62bf3b698b7534325.zip | |
Merge branch 'master' into OPW-Moderation-Update
Conflicts:
mediagoblin/db/models.py
mediagoblin/decorators.py
mediagoblin/routing.py
mediagoblin/user_pages/views.py
Diffstat (limited to 'mediagoblin/processing/__init__.py')
| -rw-r--r-- | mediagoblin/processing/__init__.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py index f3a85940..454eb09b 100644 --- a/mediagoblin/processing/__init__.py +++ b/mediagoblin/processing/__init__.py @@ -184,7 +184,6 @@ class BaseProcessingFail(Exception): def __init__(self, **metadata): self.metadata = metadata or {} - class BadMediaFail(BaseProcessingFail): """ Error that should be raised when an inappropriate file was given |