Skip to content

Commit

Permalink
Restore settings
Browse files Browse the repository at this point in the history
Signed-off-by: Lincoln Simba <[email protected]>
  • Loading branch information
lincmba committed Jan 8, 2019
1 parent 8f0330a commit 13b20d9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
3 changes: 1 addition & 2 deletions onadata/apps/api/tests/viewsets/test_media_viewset.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ def test_retrieve_view_no_filename_param(self):
self.assertEqual(response.status_code, 404)

def test_retrieve_small_png(self):
# self._submit_transport_instance_w_attachment(
# survey_at=4, media_file="ona_png_image.png")
"""Test retrieve png images"""
s = 'transport_2011-07-25_19-05-49_1'
media_file = "ona_png_image.png"

Expand Down
10 changes: 9 additions & 1 deletion onadata/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,23 @@
# imports this one.
# The local files should be used as the value for your DJANGO_SETTINGS_MODULE
# environment variable as needed.
import logging
import os
import socket
import subprocess # noqa, used by included files
import sys
from imp import reload

from celery.signals import after_setup_logger
from future.moves.urllib.parse import urljoin

from past.builtins import basestring

from django.core.exceptions import SuspiciousOperation
from django.utils.log import AdminEmailHandler

from celery.signals import after_setup_logger


# setting default encoding to utf-8
if sys.version[0] == '2':
reload(sys)
Expand Down

0 comments on commit 13b20d9

Please sign in to comment.