diff --git a/apps/rss_feeds/page_importer.py b/apps/rss_feeds/page_importer.py index 6df42284b..5b50328df 100644 --- a/apps/rss_feeds/page_importer.py +++ b/apps/rss_feeds/page_importer.py @@ -193,7 +193,7 @@ class PageImporter(object): if response.encoding and response.encoding != 'utf-8': try: data = data.encode(response.encoding) - except LookupError: + except (LookupError, UnicodeEncodeError): pass if data: diff --git a/apps/rss_feeds/text_importer.py b/apps/rss_feeds/text_importer.py index 5f44d3dcd..e97abf1d9 100644 --- a/apps/rss_feeds/text_importer.py +++ b/apps/rss_feeds/text_importer.py @@ -64,7 +64,7 @@ class TextImporter: if resp.encoding and resp.encoding != 'utf-8': try: text = text.encode(resp.encoding) - except LookupError: + except (LookupError, UnicodeEncodeError): pass if text: diff --git a/fabfile.py b/fabfile.py index 71e441ebe..50132bd27 100644 --- a/fabfile.py +++ b/fabfile.py @@ -505,6 +505,17 @@ def pip(): run('pip install --upgrade pip') run('pip install -r requirements.txt') sudo('swapoff /swapfile') + +def solo_pip(role): + if role == "app": + gunicorn_stop() + pip() + deploy_code(reload=True) + elif role == "task": + celery_stop() + copy_task_settings() + pip() + celery() # PIL - Only if python-imaging didn't install through apt-get, like on Mac OS X. def setup_imaging():