aa0a158 backport GH#530 to fix #1408282 (crash with Python 3.6)

Authored and Committed by adamwill 7 years ago
    backport GH#530 to fix #1408282 (crash with Python 3.6)
    
    Doing this as a downstream patch as all maintainers appear to
    be on end-of-year PTO already, and I don't want composes broken
    all the way till the new year.
    
        
file added
+30
file modified
+7 -1