Merge branch 'master' into pg_dump

Author: Fenimorkin

hooks/pre-commit

@@ -1,13 +1,23 @@
 #!/bin/bash
 
+set -e
+
 # capture the changed files that have been staged
 changed_files=$(git diff --staged --name-only)
 
 for file in ${changed_files}
 do
 	if [[ "${file##*.}" == "py" ]]; then
-		echo "Yapfing ${file}"
-		yapf ${file} -i
-		git add ${file}
+		if command -v yapf > /dev/null; then
+			echo "Run yapf on ${file}"
+			yapf ${file} -i
+			git add ${file}
+		fi
+
+		if command -v flake8 > /dev/null; then
+			echo "Run flake8 on ${file}"
+			flake8 ${file}
+		fi
 	fi
 done
+

tests/test_simple.py

@@ -46,8 +46,8 @@
 
 def util_exists(util):
     def good_properties(f):
-        return (os.path.exists(f) and
-                os.path.isfile(f) and
+        return (os.path.exists(f) and  # noqa: W504
+                os.path.isfile(f) and  # noqa: W504
                 os.access(f, os.X_OK))  # yapf: disable
 
     # try to resolve it
@@ -72,7 +72,7 @@ def removing(f):
 class TestgresTests(unittest.TestCase):
     def test_node_repr(self):
         with get_new_node() as node:
-            pattern = 'PostgresNode\(name=\'.+\', port=.+, base_dir=\'.+\'\)'
+            pattern = r"PostgresNode\(name='.+', port=.+, base_dir='.+'\)"
             self.assertIsNotNone(re.match(pattern, str(node)))
 
     def test_custom_init(self):
@@ -263,7 +263,7 @@ def test_psql(self):
             # check feeding input
             node.safe_psql('create table horns (w int)')
             node.safe_psql(
-                'copy horns from stdin (format csv)', input=b"1\n2\n3\n\.\n")
+                'copy horns from stdin (format csv)', input=b"1\n2\n3\n\\.\n")
             _sum = node.safe_psql('select sum(w) from horns')
             self.assertEqual(_sum, b'6\n')