{"id":3778,"url":"https://patchwork.libcamera.org/api/patches/3778/?format=json","web_url":"https://patchwork.libcamera.org/patch/3778/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200512000322.11753-25-laurent.pinchart@ideasonboard.com>","date":"2020-05-12T00:03:22","name":"[libcamera-devel,24/24] utils: raspberrypi: ctt: Fix pycodestyle E302","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"63de8365d1ee636db17e5143f95f74de35eac86d","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3778/mbox/","series":[{"id":897,"url":"https://patchwork.libcamera.org/api/series/897/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=897","date":"2020-05-12T00:02:58","name":"utils: raspberrypi: ctt: Comply with pycodestyle","version":1,"mbox":"https://patchwork.libcamera.org/series/897/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3778/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3778/checks/","tags":{},"headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BAE2060E1F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 12 May 2020 02:03:48 +0200 (CEST)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 429CC33E;\n\tTue, 12 May 2020 02:03:48 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"no+m6j8/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589241828;\n\tbh=fKAq1+3vTnfpj7NUbvogQ3/xjDGKdWwswTm/IuswWZY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=no+m6j8/ulreQLtE7XY9syuk5VqZO3NduuUW7JM6lfzlAoSFUqXH/SRAeTDKHk3cL\n\tiSpS0uPHhuwb2H38udECRE8HasoRnM2ry40m+iBRCdgDlNtLldQRCaMPejkYdwiko1\n\tjQVYBnsG//idMM8a0XMJFpX0v/dYyIly+ZPryhU0=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 12 May 2020 03:03:22 +0300","Message-Id":"<20200512000322.11753-25-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.26.2","In-Reply-To":"<20200512000322.11753-1-laurent.pinchart@ideasonboard.com>","References":"<20200512000322.11753-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 24/24] utils: raspberrypi: ctt: Fix\n\tpycodestyle E302","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Tue, 12 May 2020 00:03:49 -0000"},"content":"E302 expected 2 blank lines, found 0\n\nNote that issues are still flagged, due to the use of docstrings as\nmulti-lines comments. This will be addressed separately.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n utils/raspberrypi/ctt/ctt.py                   | 2 ++\n utils/raspberrypi/ctt/ctt_alsc.py              | 1 +\n utils/raspberrypi/ctt/ctt_awb.py               | 1 +\n utils/raspberrypi/ctt/ctt_ccm.py               | 1 +\n utils/raspberrypi/ctt/ctt_geq.py               | 1 +\n utils/raspberrypi/ctt/ctt_image_load.py        | 2 ++\n utils/raspberrypi/ctt/ctt_lux.py               | 2 ++\n utils/raspberrypi/ctt/ctt_macbeth_locator.py   | 2 ++\n utils/raspberrypi/ctt/ctt_noise.py             | 1 +\n utils/raspberrypi/ctt/ctt_pretty_print_json.py | 4 ++++\n utils/raspberrypi/ctt/ctt_ransac.py            | 2 ++\n utils/raspberrypi/ctt/ctt_tools.py             | 1 +\n 12 files changed, 20 insertions(+)","diff":"diff --git a/utils/raspberrypi/ctt/ctt.py b/utils/raspberrypi/ctt/ctt.py\nindex 02f1d8531269..81c724aeb2e0 100755\n--- a/utils/raspberrypi/ctt/ctt.py\n+++ b/utils/raspberrypi/ctt/ctt.py\n@@ -34,6 +34,7 @@ blank json file. This has been done to avoid reproducing the entire json file\n in the code here, thereby avoiding unecessary clutter.\n \"\"\"\n \n+\n \"\"\"\n Get the colour and lux values from the strings of each inidvidual image\n \"\"\"\n@@ -702,6 +703,7 @@ class Camera:\n             self.log += '\\nERROR: Images are from different cameras'\n             return 0\n \n+\n def run_ctt(json_output, directory, config, log_output):\n     \"\"\"\n     check input files are jsons\ndiff --git a/utils/raspberrypi/ctt/ctt_alsc.py b/utils/raspberrypi/ctt/ctt_alsc.py\nindex b988f565f245..89e86469a78e 100644\n--- a/utils/raspberrypi/ctt/ctt_alsc.py\n+++ b/utils/raspberrypi/ctt/ctt_alsc.py\n@@ -9,6 +9,7 @@ import matplotlib.pyplot as plt\n from matplotlib import cm\n from mpl_toolkits.mplot3d import Axes3D\n \n+\n \"\"\"\n preform alsc calibration on a set of images\n \"\"\"\ndiff --git a/utils/raspberrypi/ctt/ctt_awb.py b/utils/raspberrypi/ctt/ctt_awb.py\nindex 834d4dec2742..3c8cd9027a1a 100644\n--- a/utils/raspberrypi/ctt/ctt_awb.py\n+++ b/utils/raspberrypi/ctt/ctt_awb.py\n@@ -9,6 +9,7 @@ import matplotlib.pyplot as plt\n from bisect import bisect_left\n from scipy.optimize import fmin\n \n+\n \"\"\"\n obtain piecewise linear approximation for colour curve\n \"\"\"\ndiff --git a/utils/raspberrypi/ctt/ctt_ccm.py b/utils/raspberrypi/ctt/ctt_ccm.py\nindex dd660e40bb66..cebecfc248a6 100644\n--- a/utils/raspberrypi/ctt/ctt_ccm.py\n+++ b/utils/raspberrypi/ctt/ctt_ccm.py\n@@ -7,6 +7,7 @@\n from ctt_image_load import *\n from ctt_awb import get_alsc_patches\n \n+\n \"\"\"\n takes 8-bit macbeth chart values, degammas and returns 16 bit\n \"\"\"\ndiff --git a/utils/raspberrypi/ctt/ctt_geq.py b/utils/raspberrypi/ctt/ctt_geq.py\nindex d24b216389df..2aa668f133a8 100644\n--- a/utils/raspberrypi/ctt/ctt_geq.py\n+++ b/utils/raspberrypi/ctt/ctt_geq.py\n@@ -8,6 +8,7 @@ from ctt_tools import *\n import matplotlib.pyplot as plt\n import scipy.optimize as optimize\n \n+\n \"\"\"\n Uses green differences in macbeth patches to fit green equalisation threshold\n model. Ideally, all macbeth chart centres would fall below the threshold as\ndiff --git a/utils/raspberrypi/ctt/ctt_image_load.py b/utils/raspberrypi/ctt/ctt_image_load.py\nindex 240d68f984a2..66adb23733d7 100644\n--- a/utils/raspberrypi/ctt/ctt_image_load.py\n+++ b/utils/raspberrypi/ctt/ctt_image_load.py\n@@ -210,6 +210,7 @@ class Image:\n         self.patches = all_patches\n         return 1\n \n+\n def brcm_load_image(Cam, im_str):\n     \"\"\"\n     Load image where raw data and metadata is in the BRCM format\n@@ -290,6 +291,7 @@ def brcm_load_image(Cam, im_str):\n \n     return Img\n \n+\n def dng_load_image(Cam, im_str):\n     try:\n         Img = Image(None)\ndiff --git a/utils/raspberrypi/ctt/ctt_lux.py b/utils/raspberrypi/ctt/ctt_lux.py\nindex ab367cae37d7..4e7785ef35e1 100644\n--- a/utils/raspberrypi/ctt/ctt_lux.py\n+++ b/utils/raspberrypi/ctt/ctt_lux.py\n@@ -5,6 +5,8 @@\n # ctt_lux.py - camera tuning tool for lux level\n \n from ctt_tools import *\n+\n+\n \"\"\"\n Find lux values from metadata and calculate Y\n \"\"\"\ndiff --git a/utils/raspberrypi/ctt/ctt_macbeth_locator.py b/utils/raspberrypi/ctt/ctt_macbeth_locator.py\nindex 6567490c5539..35c848072a08 100644\n--- a/utils/raspberrypi/ctt/ctt_macbeth_locator.py\n+++ b/utils/raspberrypi/ctt/ctt_macbeth_locator.py\n@@ -13,6 +13,7 @@ NOTE: some custom functions have been used here to make the code more readable.\n These are defined in tools.py if they are needed for reference.\n \"\"\"\n \n+\n \"\"\"\n Some inconsistencies between packages cause runtime warnings when running\n the clustering algorithm. This catches these warnings so they don't flood the\n@@ -291,6 +292,7 @@ def find_macbeth(Cam, img, mac_config=(0, 0)):\n \n     return(coords_fit)\n \n+\n def get_macbeth_chart(img, ref_data):\n     \"\"\"\n     function returns coordinates of macbeth chart vertices and square centres,\ndiff --git a/utils/raspberrypi/ctt/ctt_noise.py b/utils/raspberrypi/ctt/ctt_noise.py\nindex ba57f1d1d2c5..0afcf8f850cc 100644\n--- a/utils/raspberrypi/ctt/ctt_noise.py\n+++ b/utils/raspberrypi/ctt/ctt_noise.py\n@@ -7,6 +7,7 @@\n from ctt_image_load import *\n import matplotlib.pyplot as plt\n \n+\n \"\"\"\n Find noise standard deviation and fit to model:\n \ndiff --git a/utils/raspberrypi/ctt/ctt_pretty_print_json.py b/utils/raspberrypi/ctt/ctt_pretty_print_json.py\nindex fac9e98ba9dd..73383ea09665 100644\n--- a/utils/raspberrypi/ctt/ctt_pretty_print_json.py\n+++ b/utils/raspberrypi/ctt/ctt_pretty_print_json.py\n@@ -4,6 +4,7 @@\n #\n # ctt_pretty_print_json.py - camera tuning tool JSON formatter\n \n+\n \"\"\"\n takes a collapsed json file and makes it more readable\n \"\"\"\n@@ -11,10 +12,12 @@ def process_file(string, fout, state):\n     for c in string:\n         process_char(c, fout, state)\n \n+\n def print_newline(fout, state):\n     fout.write('\\n')\n     fout.write(' '*state[\"indent\"]*4)\n \n+\n def process_char(c, fout, state):\n     if c == '{':\n         if not state[\"skipnewline\"]:\n@@ -61,6 +64,7 @@ def process_char(c, fout, state):\n         fout.write(c)\n     state[\"skipnewline\"] = (c == '[')\n \n+\n def pretty_print_json(str_in, output_filename):\n     state = {\"indent\": 0, \"inarray\": [False], \"arraycount\": [], \"skipnewline\": True}\n     with open(output_filename, \"w\") as fout:\ndiff --git a/utils/raspberrypi/ctt/ctt_ransac.py b/utils/raspberrypi/ctt/ctt_ransac.py\nindex 392275445c14..11515a4fab08 100644\n--- a/utils/raspberrypi/ctt/ctt_ransac.py\n+++ b/utils/raspberrypi/ctt/ctt_ransac.py\n@@ -8,6 +8,7 @@ import numpy as np\n \n scale = 2\n \n+\n \"\"\"\n constructs normalised macbeth chart corners for ransac algorithm\n \"\"\"\n@@ -57,6 +58,7 @@ def get_square_verts(c_err=0.05, scale=scale):\n     # print(square_verts)\n     return np.array(square_verts, np.float32), mac_norm\n \n+\n def get_square_centres(c_err=0.05, scale=scale):\n     \"\"\"\n     define macbeth square centres\ndiff --git a/utils/raspberrypi/ctt/ctt_tools.py b/utils/raspberrypi/ctt/ctt_tools.py\nindex d5d64d47d25b..48e0aac26a1f 100644\n--- a/utils/raspberrypi/ctt/ctt_tools.py\n+++ b/utils/raspberrypi/ctt/ctt_tools.py\n@@ -22,6 +22,7 @@ understanding of the code. They ar collated here to attempt to improve code\n readability in the main files.\n \"\"\"\n \n+\n \"\"\"\n obtain config values, unless it doesnt exist, in which case pick default\n Furthermore, it can check if the input is the correct type\n","prefixes":["libcamera-devel","24/24"]}