fix to __doc__ use in setup.py to make -O0 installation mode working

3 files changed, 10 insertions, 4 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index c5a870d..2e91f72 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Revision 0.1.10, released 10-10-2015
+------------------------------------
+
+- Fix to __doc__ use in setup.py to make -O0 installation mode working.
+
 Revision 0.1.9, released 28-09-2015
 -----------------------------------
 
diff --git a/pyasn1/__init__.py b/pyasn1/__init__.py
index 5f09300..f75f513 100644
--- a/pyasn1/__init__.py
+++ b/pyasn1/__init__.py
@@ -1,7 +1,7 @@
 import sys
 
 # http://www.python.org/dev/peps/pep-0396/
-__version__ = '0.1.9'
+__version__ = '0.1.10'
 
 if sys.version_info[:2] < (2, 4):
     raise RuntimeError('PyASN1 requires Python 2.4 or later')
diff --git a/setup.py b/setup.py
index 3382b2b..2bac77c 100644
--- a/setup.py
+++ b/setup.py
@@ -55,9 +55,10 @@ except ImportError:
     from distutils.core import setup, Command
     params = {}
 
-doclines = [ x.strip() for x in __doc__.split('\n') if x ]
+doclines = [x.strip() for x in (__doc__ or '').split('\n') if x]
 
-params.update( {
+
+params.update({
     'name': 'pyasn1',
     'version': open(os.path.join('pyasn1','__init__.py')).read().split('\'')[1],
     'description': doclines[0],
@@ -76,7 +77,7 @@ params.update( {
                   'pyasn1.codec.ber',
                   'pyasn1.codec.cer',
                   'pyasn1.codec.der' ]
-} )
+})
 
 # handle unittest discovery feature
 if sys.version_info[0:2] < (2, 7) or \