From de6b6a3532cbf6d49a1977a0213a71433e29ab0e Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 28 Nov 2017 10:13:45 +0200 Subject: [PATCH] Use automatic formatters --- lib/sql.py | 2 +- tests/test_sql.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/sql.py b/lib/sql.py index d89e1176..c9f4abf3 100644 --- a/lib/sql.py +++ b/lib/sql.py @@ -172,7 +172,7 @@ class SQL(Composable): Example:: - >>> query = sql.SQL("select {0} from {1}").format( + >>> query = sql.SQL("select {} from {}").format( ... sql.SQL(', ').join([sql.Identifier('foo'), sql.Identifier('bar')]), ... sql.Identifier('table')) >>> print(query.as_string(conn)) diff --git a/tests/test_sql.py b/tests/test_sql.py index 2e12ba63..fc2df640 100755 --- a/tests/test_sql.py +++ b/tests/test_sql.py @@ -40,7 +40,7 @@ class SqlFormatTests(ConnectingTestCase): self.assertEqual(s1, 'select "field" from "table"') def test_pos_spec(self): - s = sql.SQL("select {0} from {1}").format( + s = sql.SQL("select {} from {}").format( sql.Identifier('field'), sql.Identifier('table')) s1 = s.as_string(self.conn) self.assert_(isinstance(s1, str)) @@ -60,14 +60,14 @@ class SqlFormatTests(ConnectingTestCase): self.assertEqual(s1, 'select "field" from "table"') def test_unicode(self): - s = sql.SQL(u"select {0} from {1}").format( + s = sql.SQL(u"select {} from {}").format( sql.Identifier(u'field'), sql.Identifier('table')) s1 = s.as_string(self.conn) self.assert_(isinstance(s1, unicode)) self.assertEqual(s1, u'select "field" from "table"') def test_compose_literal(self): - s = sql.SQL("select {0};").format(sql.Literal(dt.date(2016, 12, 31))) + s = sql.SQL("select {};").format(sql.Literal(dt.date(2016, 12, 31))) s1 = s.as_string(self.conn) self.assertEqual(s1, "select '2016-12-31'::date;") @@ -77,18 +77,18 @@ class SqlFormatTests(ConnectingTestCase): self.assertEqual(s1, "select foo;") def test_percent_escape(self): - s = sql.SQL("42 % {0}").format(sql.Literal(7)) + s = sql.SQL("42 % {}").format(sql.Literal(7)) s1 = s.as_string(self.conn) self.assertEqual(s1, "42 % 7") def test_braces_escape(self): - s = sql.SQL("{{{0}}}").format(sql.Literal(7)) + s = sql.SQL("{{{}}}").format(sql.Literal(7)) self.assertEqual(s.as_string(self.conn), "{7}") s = sql.SQL("{{1,{0}}}").format(sql.Literal(7)) self.assertEqual(s.as_string(self.conn), "{1,7}") def test_compose_badnargs(self): - self.assertRaises(IndexError, sql.SQL("select {0};").format) + self.assertRaises(IndexError, sql.SQL("select {};").format) def test_compose_badnargs_auto(self): self.assertRaises(IndexError, sql.SQL("select {};").format)