Merge lp:~dobey/pay-service/pychecks into lp:pay-service

[dobey]

Add pep8 and pyflakes3 test rules.
Clean up the warnings from pep8 and pyflakes.

[lp:~dobey/pay-service/pychecks]

120. By dobey on 2016-05-20

Fallback for pre-split pyflakes package.

121. By dobey on 2016-05-20

Fix typo in or dependency.

[Charles Kerr (charlesk)]

LGTM.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-08 23:25:11 +0000
+++ CMakeLists.txt	2016-05-20 14:25:52 +0000
@@ -109,3 +109,15 @@
   TESTS libpay-iap-tests libpay-package-tests
   FILTER ${filter-list}
 )
+
+
+file(RELATIVE_PATH RELATIVE_SRCDIR ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+##
+##  Python static checking
+##
+add_test(NAME pep8
+  COMMAND pep8 ${RELATIVE_SRCDIR}
+)
+add_test(NAME pyflakes
+  COMMAND pyflakes3 ${RELATIVE_SRCDIR}
+)

=== modified file 'debian/control'
--- debian/control	2016-05-20 14:25:52 +0000
+++ debian/control	2016-05-20 14:25:52 +0000
@@ -26,7 +26,9 @@
                libtrust-store-dev,
                libubuntu-app-launch2-dev (>= 0.5),
                libubuntuoneauth-2.0-dev,
+               pep8,
                pkg-config,
+               pyflakes3 | pyflakes (>= 0.8.1-1),
                python3-dbusmock,
                qt5-default,
                qtbase5-dev,

=== modified file 'pay-ui/backend/tests/mock_click_server.py'
--- pay-ui/backend/tests/mock_click_server.py	2016-03-08 21:28:56 +0000
+++ pay-ui/backend/tests/mock_click_server.py	2016-05-20 14:25:52 +0000
@@ -19,19 +19,17 @@
                 "description": "PayPal",
                 "id": "paypal",
                 "preferred": False,
-                "choices": [
-                    {
-                        "currencies": [
-                            "USD",
-                            "GBP",
-                            "EUR"
-                        ],
-                        "id": 532,
-                        "requires_interaction": False,
-                        "preferred": False,
-                        "description": "PayPal Preapproved Payment (exp. 2014-04-12)"
-                    }
-                ]
+                "choices": [{
+                    "currencies": [
+                        "USD",
+                        "GBP",
+                        "EUR"
+                    ],
+                    "id": 532,
+                    "requires_interaction": False,
+                    "preferred": False,
+                    "description": "PayPal Preapproved (exp. 2014-04-12)"
+                }]
             },
             {
                 "description": "Credit or Debit Card",
@@ -45,7 +43,7 @@
                         "id": 1767,
                         "requires_interaction": False,
                         "preferred": False,
-                        "description": "**** **** **** 1111 (Visa, exp. 02/2015)"
+                        "description": "**** **** **** 1111 (X, exp. 02/2015)"
                     },
                     {
                         "currencies": [
@@ -54,7 +52,7 @@
                         "id": 1726,
                         "requires_interaction": False,
                         "preferred": True,
-                        "description": "**** **** **** 1111 (Visa, exp. 03/2015)"
+                        "description": "**** **** **** 1111 (X, exp. 03/2015)"
                     }
                 ]
             }
@@ -120,8 +118,8 @@
 
     def do_POST(self):
         """Respond to a POST request."""
-        #content = self.rfile.read(int(self.headers.get('content-length')))
-        #structure = json.loads(content.decode('utf-8'))
+        # content = self.rfile.read(int(self.headers.get('content-length')))
+        # structure = json.loads(content.decode('utf-8'))
         self.do_GET()
 
     def do_GET(self):

=== modified file 'pay-ui/tests/autopilot/pay_ui/tests/__init__.py'
--- pay-ui/tests/autopilot/pay_ui/tests/__init__.py	2016-03-10 21:12:52 +0000
+++ pay-ui/tests/autopilot/pay_ui/tests/__init__.py	2016-05-20 14:25:52 +0000
@@ -15,10 +15,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import fixtures
-import json
 import os
 import shutil
-import subprocess
 import tempfile
 import ubuntuuitoolkit as uitk
 

=== modified file 'pay-ui/tests/autopilot/pay_ui/tests/mock_server.py'
--- pay-ui/tests/autopilot/pay_ui/tests/mock_server.py	2016-03-08 21:28:56 +0000
+++ pay-ui/tests/autopilot/pay_ui/tests/mock_server.py	2016-05-20 14:25:52 +0000
@@ -22,7 +22,8 @@
 
 html_success = """
 <html>
-    <body bgcolor="green" onClick="window.location.assign('/paymentmethods/completeadd')">
+    <body bgcolor="green"
+          onClick="window.location.assign('/paymentmethods/completeadd')">
         <h1>Placeholder for web interaction</h1>
         <p>Click anywhere to proceed</p>
     </body>
@@ -31,7 +32,8 @@
 
 html_cancel = """
 <html>
-    <body bgcolor="red" onClick="window.location.assign('/api/2.0/click/cancelled')">
+    <body bgcolor="red"
+          onClick="window.location.assign('/api/2.0/click/cancelled')">
         <h1>Placeholder for web interaction</h1>
         <p>Click anywhere to cancel</p>
     </body>
@@ -233,8 +235,8 @@
 
     def do_POST(self):
         """Respond to a POST request."""
-        #content = self.rfile.read(int(self.headers.get('content-length')))
-        #structure = json.loads(content.decode('utf-8'))
+        # content = self.rfile.read(int(self.headers.get('content-length')))
+        # structure = json.loads(content.decode('utf-8'))
         if self.path.find("purchases/") != -1:
             self.response_buy_item()
 

=== modified file 'tests/com_canonical_pay_store.py'
--- tests/com_canonical_pay_store.py	2016-01-13 16:41:33 +0000
+++ tests/com_canonical_pay_store.py	2016-05-20 14:25:52 +0000
@@ -48,6 +48,7 @@
             encoded.append('_{:02x}'.format(ord(ch)))
     return ''.join(encoded)
 
+
 def build_store_path(package_name):
     return STORE_PATH_PREFIX + '/' + encode_path_element(package_name)
 
@@ -99,7 +100,7 @@
 
     item = Item(sku)
     store.items[sku] = item
-    store.set_item (store, sku, properties)
+    store.set_item(store, sku, properties)
 
 
 def store_set_item(store, sku, properties):
@@ -158,7 +159,8 @@
         elif sku != 'cancel':
             item = store.items[sku]
             item.set_property('state', 'approved')
-            item.set_property('purchase_id', dbus.UInt64(store.next_purchase_id))
+            item.set_property('purchase_id',
+                              dbus.UInt64(store.next_purchase_id))
             item.set_property('completed_timestamp', dbus.UInt64(time.time()))
             store.next_purchase_id += 1
         return store_get_item(store, sku)
@@ -177,7 +179,8 @@
     try:
         item = store.items[sku]
         if (item.bus_properties['state'] == 'purchased' and
-            item.bus_properties['refundable_until'] > dbus.UInt64(time.time())):
+            (item.bus_properties['refundable_until'] >
+             dbus.UInt64(time.time()))):
             del store.items[sku]
             return dbus.Dictionary({
                 'state': 'available',
@@ -232,17 +235,24 @@
     store.refund_item = store_refund_item
     store.acknowledge_item = store_acknowledge_item
     store.AddMethods(STORE_IFACE, [
-                       ('AddItem', 'a{sv}', '', 'self.add_item(self, args[0])'),
-                       ('SetItem', 'sa{sv}', '', 'self.set_item(self, args[0], args[1])'),
-                       ('GetItem', 's', 'a{sv}', 'ret = self.get_item(self, args[0])'),
-                       ('GetPurchasedItems', '', 'aa{sv}', 'ret = self.get_purchased_items(self)'),
-                       ('PurchaseItem', 's', 'a{sv}', 'ret = self.purchase_item(self, args[0])'),
-                       ('RefundItem', 's', 'a{sv}', 'ret = self.refund_item(self, args[0])'),
-                       ('AcknowledgeItem', 's', 'a{sv}', 'ret = self.acknowledge_item(self, args[0])'),
-                     ])
+        ('AddItem', 'a{sv}', '',
+         'self.add_item(self, args[0])'),
+        ('SetItem', 'sa{sv}', '',
+         'self.set_item(self, args[0], args[1])'),
+        ('GetItem', 's', 'a{sv}',
+         'ret = self.get_item(self, args[0])'),
+        ('GetPurchasedItems', '', 'aa{sv}',
+         'ret = self.get_purchased_items(self)'),
+        ('PurchaseItem', 's', 'a{sv}',
+         'ret = self.purchase_item(self, args[0])'),
+        ('RefundItem', 's', 'a{sv}',
+         'ret = self.refund_item(self, args[0])'),
+        ('AcknowledgeItem', 's', 'a{sv}',
+         'ret = self.acknowledge_item(self, args[0])'),
+    ])
 
     for item in items:
-        store.add_item(store, item);
+        store.add_item(store, item)
 
 
 def main_get_stores(mock):