traceback

.gitignore

@@ -40,3 +40,4 @@ tcrudge.egg-info/
 
 # Pypi
 .pypirc
+.pkg

setup.py

@@ -6,17 +6,11 @@
 
 from setuptools import setup
 
-try:
-    import pypandoc
-except ImportError:
-    print("pypandoc not installed.\nUse `pip install pypandoc`.\nExiting.")
-    sys.exit(1)
-
-
-def read_md(f):
-    """
-    Converts md file to rst text
-    """
+def get_long_description(f):
+    try:
+        import pypandoc
+    except ImportError:
+        return 'No description'
     return pypandoc.convert(f, 'rst')
 
 install_requires = [
@@ -82,6 +76,11 @@ def get_package_data(package):
 version = get_version('tcrudge')
 
 if sys.argv[-1] == 'publish':
+    try:
+        import pypandoc
+    except ImportError:
+        print("pypandoc not installed.\nUse `pip install pypandoc`.\nExiting.")
+        sys.exit(1)
     pypandoc.download_pandoc()
     if os.system("pip freeze | grep twine"):
         print("twine not installed.\nUse `pip install twine`.\nExiting.")
@@ -99,7 +98,7 @@ def get_package_data(package):
     url='https://github.com/CodeTeam/tcrudge',
     license='MIT',
     description='Tornado RESTful API with Peewee',
-    long_description=read_md('readme.md'),
+    long_description=get_long_description('readme.md'),
     author='Code Team',
     author_email='saborisov@sberned.ru',
     packages=get_packages('tcrudge'),

tcrudge/__init__.py

@@ -6,4 +6,4 @@
 Supports JSON and MessagePack responses.
 """
 
-__version__ = '0.9.1'
+__version__ = '0.9.3'

tcrudge/handlers.py

@@ -97,10 +97,9 @@ def write_error(self, status_code, **kwargs):
             self.set_header('Content-Type', 'text/plain')
             for line in traceback.format_exception(*exc_info):
                 self.write(line)
-        else:
-            # exc_info[1] - HTTPError instance
-            # Finish request with exception body or exception reason
-            self.write(getattr(exc_info[1], 'body', self._reason))
+        # exc_info[1] - HTTPError instance
+        # Finish request with exception body or exception reason
+        self.write(getattr(exc_info[1], 'body', self._reason))
         self.finish()
 
     async def validate(self, data, schema, **kwargs):