From 11db35edba5f3bb3a3d8c6d587eba5a276e71be8 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 12 Mar 2019 15:49:54 +1000
Subject: [PATCH] Fix flake8 warnings (#678)

The only notable one here is the regex that had an escape sequence

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 data/devices/data-parse-test.py |  6 +++---
 doc/conf.py.in                  |  3 ---
 tools/merge_ratbagd.py          | 10 +++++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/data/devices/data-parse-test.py b/data/devices/data-parse-test.py
index 1882c384..f6e522d3 100755
--- a/data/devices/data-parse-test.py
+++ b/data/devices/data-parse-test.py
@@ -26,9 +26,9 @@
 #
 
 import argparse
-import os
 import configparser
 
+
 def assertIn(element, l):
     if element not in l:
         raise AssertionError('{} must be in {}'.format(element, l))
@@ -61,7 +61,7 @@ def check_ledtypes_str(string):
 
     types = string.split(';')
     for t in types:
-        if not t: # emtpy string if trailing ;
+        if not t:  # emtpy string if trailing ;
             continue
 
         assertIn(t, permitted_types)
@@ -88,7 +88,7 @@ def check_section_device(section):
 def check_dpi_range_str(string):
     import re
 
-    m = re.search('^([0-9]+):([0-9]+)@([0-9\.]+)$', string)
+    m = re.search('^([0-9]+):([0-9]+)@([0-9.]+)$', string)
     assert(m is not None)
     min = int(m.group(1))
     max = int(m.group(2))
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 010094fe..0c006738 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -152,6 +152,3 @@ texinfo_documents = [
      author, '@PACKAGE_NAME@', 'One line description of project.',
      'Miscellaneous'),
 ]
-
-
-
diff --git a/tools/merge_ratbagd.py b/tools/merge_ratbagd.py
index 06f90814..69438ba0 100755
--- a/tools/merge_ratbagd.py
+++ b/tools/merge_ratbagd.py
@@ -31,8 +31,8 @@ import sys
 
 def print_ratbagctl(ratbagctl_path, ratbagd_path, version_string):
     with open(ratbagctl_path, 'r', encoding='utf-8') as ratbagctl, open(ratbagd_path, 'r', encoding='utf-8') as ratbagd:
-        for l in ratbagctl.readlines():
-            if l.startswith("from ratbagd import "):
+        for line in ratbagctl.readlines():
+            if line.startswith("from ratbagd import "):
                 headers = True
                 for r in ratbagd.readlines():
                     if not r.startswith('#') and r.strip():
@@ -40,9 +40,9 @@ def print_ratbagctl(ratbagctl_path, ratbagd_path, version_string):
                     if not headers:
                         print(r.rstrip('\n'))
             else:
-                if '@version@' in l:
-                    l = l.replace('@version@', version_string)
-                print(l.rstrip('\n'))
+                if '@version@' in line:
+                    line = line.replace('@version@', version_string)
+                print(line.rstrip('\n'))
 
 
 def main(argv):