commit 64cef5ebb256914ec2b3bcec82a593a2d2629e58
author Clemenz Portmann <portmannc@google.com> Fri May 07 09:03:20 2021 -0700
committer Clemenz Portmann <portmannc@google.com> Fri May 07 16:07:37 2021 +0000
tree ee89ad4c0f67207ed4bd71f9053aa9864e46e199
parent 6d5f48a754e07886efeb4075cdb85d827447626e

ITS: utils/capture_request_utils PY3 readability cleanup.

bug: 187513164
Change-Id: I10772a59e1e43979028200dd8891cd000b1d2060

apps/CameraITS/utils/capture_request_utils.py

diff --git a/apps/CameraITS/utils/capture_request_utils.py b/apps/CameraITS/utils/capture_request_utils.py
index e3825a9..6b002f7 100644
--- a/apps/CameraITS/utils/capture_request_utils.py
+++ b/apps/CameraITS/utils/capture_request_utils.py
@@ -14,7 +14,6 @@
 """Utility functions to create custom capture requests."""
 
 
-import logging
 import math
 import unittest
 
@@ -88,7 +87,8 @@
           0
   }
   if linear_tonemap:
-    assert props is not None
+    if props is None:
+      raise AssertionError('props is None.')
     # CONTRAST_CURVE mode
     if 0 in props['android.tonemap.availableToneMapModes']:
       req['android.tonemap.mode'] = 0
@@ -102,8 +102,7 @@
       req['android.tonemap.mode'] = 3
       req['android.tonemap.gamma'] = 1.0
     else:
-      logging.debug('Linear tonemap is not supported')
-      assert False
+      raise AssertionError('Linear tonemap is not supported')
   return req
 
 
@@ -132,8 +131,8 @@
       'jpeg': 0x100,
       'y8': 0x20203859
   }
-  configs = props['android.scaler.streamConfigurationMap']\
-                   ['availableStreamConfigurations']
+  configs = props[
+      'android.scaler.streamConfigurationMap']['availableStreamConfigurations']
   fmt_configs = [cfg for cfg in configs if cfg['format'] == fmt_codes[fmt]]
   out_configs = [cfg for cfg in fmt_configs if not cfg['input']]
   out_sizes = [(cfg['width'], cfg['height']) for cfg in out_configs]