b59d2be rebase to upstreamed py3 version

Authored and Committed by mjg 4 years ago
    rebase to upstreamed py3 version
    
        
file modified
+1 -0
file modified
+10 -9
file modified
+1 -1