fix DiffusionAnalyzer.from_files
Automatic Py3k merge for testing