Merge remote-tracking branch 'origin/master' into client

adamtheturtle · adamtheturtle · commit 3de7b2d0d3ad · 2019-07-31T14:45:54.000+01:00
diff --git a/spelling_private_dict.txt b/spelling_private_dict.txt
@@ -1,9 +1,11 @@
 AuthenticationFailure
 BadImage
 ImageTooLarge
+MatchProcessing
 MaxNumResultsOutOfRange
 MetadataTooLarge
 ProjectInactive
+RequestTimeTooSkewed
 TargetNameExist
 TargetProcessingTimeout
 TargetStatusProcessing
diff --git a/src/vws/query.py b/src/vws/query.py
@@ -64,6 +64,9 @@ def query(
                 is not correct.
             ~vws.exceptions.MaxNumResultsOutOfRange: `max_num_results`` is not
                 within the range (1, 50).
+            ~vws.exceptions.MatchProcessing: The given image matches a target
+                which was recently added, updated or deleted and Vuforia
+                returns an error in this case.
             ~vws.exceptions.ProjectInactive: The project is inactive.
 
         Returns:
