usddiff - _getFileFormat should return none if unrecognized format

fixes errors with tests testUsdDiffToolVariousFormats4 + 5
LumaPictures · May 2, 2017 · 2f05bd7 · 2f05bd7
1 parent 1fec5fc
commit 2f05bd7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pxr/usd/bin/usddiff/usddiff.py b/pxr/usd/bin/usddiff/usddiff.py
@@ -114,7 +114,10 @@ def _getFileFormat(path):
 
     # Don't check if file exists - this should be handled by resolver (and
     # path may not exist / have been fetched yet)
-    return fileFormat.formatId
+    if fileFormat:
+        return fileFormat.formatId
+
+    return None
 
 def _convertTo(inPath, outPath, usdcatCmd, flatten=None, fmt=None):
     # Just copy empty files -- we want something to diff against but