Merge lp:~elopio/u1-test-utils/pay-client2 into lp:u1-test-utils

[Leo Arias]

Added helpers for the Pay API client.

[lp:~elopio/u1-test-utils/pay-client2]

45. By Leo Arias on 2013-03-26

Reverted to the right version of sso pages.

46. By Leo Arias on 2013-03-26

Fixed lint errors.

[Matias Bordese (matiasb)]

Looks good!

review: Approve

[Leo Arias (elopio)]

<matiasb> elopio: did you change anything in u1testutils/sst/sso/pages.py? (it seems you removed/re-added it? maybe you should revert it instead?)
<elopio> matiasb: ahh, crap. Yes, I thought I had reverted it. thanks for pointing it out.
<elopio> matiasb: fixed.
<matiasb> elopio: ack, thanks; taking a look
<elopio> matiasb: there were a couple of lint errors. I pushed the fixes.
<matiasb> elopio: ack, one question, btw: why are you removing the encoding notice from some files?
<elopio> matiasb: that's something I read on one of the peps. It said that we should use the default encoding unless one of the authors had weird characters in the name. Let me find it.
<nessita> elopio, have a link to that? I would expect always use explicitely the encoding definition
<elopio> nessita: I'm looking.
<nessita> elopio, nice!
<elopio> nessita, matiasb: huh, here it is: http://www.python.org/dev/peps/pep-0008/#encodings-pep-263
<elopio> "Files using ASCII should not have a coding cookie. Latin-1 (or UTF-8) should only be used when a comment or docstring needs to mention an author name that requires Latin-1"
<nessita> elopio, where is that?
<nessita> elopio, sorry, got the link
<elopio> That's for the core distribution, but it says: Open source projects with a global audience are encouraged to adopt a similar policy.
<nessita> elopio, I see. I personally disagree, but I'm happy to apply it to be consistent with the pep
<elopio> nessita: it just encourages us, so I wouldn't mind if we go other way. But now the default is UTF-8, so I think soon it won't matter, right?
<nessita> elopio, the default is for python 3 (and maybe 2.7(
<nessita> ))
<elopio> nessita: so, should I keep the UTF 8 on all files?
<matiasb> elopio, nessita: so, we are ok by removing this? if not, I guess we should agree on adding the notice consistently
<nessita> elopio, I personally would not remove, instead just not add if not needed. But I do not have a strong opinion on this :-)
<elopio> I'm fine with whatever leads to consistency :)
<elopio> what about an executive team lead decission from pindonga?
<matiasb> I'm ok removing it, if we are not explicitly using weird chars, and if we don't have this anywhere else
<matiasb> nessita: you are ok with that? ^
<nessita> yes!
<matiasb> ack
<matiasb> elopio: +1 then

=== modified file 'fabtasks/development.py'
--- fabtasks/development.py	2013-01-21 03:18:56 +0000
+++ fabtasks/development.py	2013-03-26 15:13:23 +0000
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2012, 2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -42,6 +40,7 @@
     if 'unit' in suites:
         module_paths.append('u1testutils/selftests/unit')
         module_paths.append('u1testutils/sst/sso/selftests/unit')
+        module_paths.append('u1testutils/pay/selftests/unit')
     for mp in module_paths:
         suite.addTest(unittest.TestLoader().discover(mp))
     # List the tests as we run them

=== modified file 'requirements.txt'
--- requirements.txt	2013-02-27 23:19:39 +0000
+++ requirements.txt	2013-03-26 15:13:23 +0000
@@ -3,7 +3,8 @@
 mock
 pep8
 pyflakes
-sst
 Twisted
 bzr+ssh://bazaar.launchpad.net/~bloodearnest/localmail/trunk
+bzr+http://bazaar.launchpad.net/~ubuntuone-hackers/payclient/trunk@1
+bzr+http://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk@367
 bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/canonical-identity-provider/ssoclient@3

=== added directory 'u1testutils/pay'
=== added file 'u1testutils/pay/__init__.py'
=== added file 'u1testutils/pay/client.py'
--- u1testutils/pay/client.py	1970-01-01 00:00:00 +0000
+++ u1testutils/pay/client.py	2013-03-26 15:13:23 +0000
@@ -0,0 +1,96 @@
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import payclient
+from django.conf import settings
+from piston_mini_client import auth, failhandlers
+
+import u1testutils.pay.environment
+
+
+def get_pay_client(pay_server_url=None):
+    """Return the Payment Service API client.
+
+    pay_server_url -- The URL of the Pay server that provides the API. Default
+        is None, which means that the URL will be taken from value of the
+        Django settings PAY_SERVER_URL option.
+
+    """
+    user = settings.PAY_API_USERNAME
+    password = settings.PAY_API_PASSWORD
+    basic_auth = auth.BasicAuthorizer(user, password)
+    pay_server_url = _get_pay_server_url(pay_server_url)
+    pay_api_url = '{0}/api/2.0/'.format(pay_server_url)
+    return payclient.PaymentServiceAPI(
+        auth=basic_auth, service_root=pay_api_url)
+
+
+def _get_pay_server_url(pay_server_url=None):
+    if pay_server_url is None:
+        pay_server_url = \
+            u1testutils.pay.environment.get_pay_base_url()
+    else:
+        pay_server_url = pay_server_url.rstrip('/')
+    return pay_server_url
+
+
+def add_new_credit_card(shop_id, user, credit_card, billing_address,
+                        pay_server_url=None):
+    """Add a new credit card through the Pay API.
+
+    Keyword arguments:
+    shop_id -- The identifier of the shop that will add the credit card.
+    user -- The user that will have the new credit card. It must have the
+        openid attribute.
+    credit_card -- The credit card information. It must have the attributes
+        card_type,  name_on_cad, card_number, ccv_number, expiration_month and
+        expiration_year.
+    billing_address -- The billing address for the card. It must have the
+        attributes street_line1, state, country and postal_code. The country
+        is the name of the country in english.
+    pay_server_url -- The URL of the Pay server that provides the API. Default
+        is None.
+
+    """
+    billing_address_dict = {
+        'street': billing_address.street_line1,
+        'state': billing_address.state,
+        'country': _get_country_code(billing_address.country),
+        'postal': billing_address.postal_code
+    }
+    kwargs = dict(
+        shop_id=shop_id,
+        open_id=user.openid,
+        card_type=credit_card.card_type,
+        card_holder=credit_card.name_on_card,
+        card_number=credit_card.card_number,
+        card_ccv=credit_card.ccv_number,
+        card_expiration_month=credit_card.expiration_month,
+        card_expiration_year=credit_card.expiration_year,
+        billing_address=billing_address_dict
+    )
+    credit_card_request = payclient.CreditCardRequest(**kwargs)
+    pay_client = get_pay_client(pay_server_url)
+    try:
+        response = pay_client.new_credit_card(data=credit_card_request)
+        return isinstance(response, payclient.CreditCardResponse)
+    except failhandlers.APIError:
+        # TODO log the error.
+        return False
+
+
+def _get_country_code(country_name):
+    # TODO add more?
+    country_data = {'United States': 'US'}
+    return country_data.get(country_name)

=== added file 'u1testutils/pay/data.py'
--- u1testutils/pay/data.py	1970-01-01 00:00:00 +0000
+++ u1testutils/pay/data.py	2013-03-26 15:13:23 +0000
@@ -0,0 +1,71 @@
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/
+
+import uuid
+
+
+class CreditCard(object):
+
+    def __init__(self, card_type, name_on_card, card_number, ccv_number,
+                 expiration_month, expiration_year):
+        self.card_type = card_type
+        self.name_on_card = name_on_card
+        self.card_number = card_number
+        self.ccv_number = ccv_number
+        self.expiration_month = expiration_month
+        self.expiration_year = expiration_year
+
+    def __repr__(self):
+        return '%s(%r)' % (self.__class__, self.__dict__)
+
+    @classmethod
+    def make_test_visa_card(cls, unique_id=None):
+        if unique_id is None:
+            unique_id = str(uuid.uuid1())
+        card_type = 'Visa'
+        name_on_card = 'Test name {0}'.format(unique_id)
+        card_number = '4111111111111111'
+        ccv_number = '123'
+        expiration_month = '12'
+        expiration_year = '2026'
+        return cls(card_type, name_on_card, card_number, ccv_number,
+                   expiration_month, expiration_year)
+
+
+class Address(object):
+
+    def __init__(self, street_line1=None, street_line2=None, city=None,
+                 state=None, postal_code=None, country=None):
+        self.street_line1 = street_line1
+        self.street_line2 = street_line2
+        self.city = city
+        self.state = state
+        self.postal_code = postal_code
+        self.country = country
+
+    def __repr__(self):
+        return '%s(%r)' % (self.__class__, self.__dict__)
+
+    @classmethod
+    def make_unique(cls, unique_id=None):
+        if unique_id is None:
+            unique_id = str(uuid.uuid1())
+        street_line1 = "Test street line 1 {0}".format(unique_id)
+        street_line2 = "Test street line 2 {0}".format(unique_id)
+        city = "Test city {0}".format(unique_id)
+        state = "Test state {0}".format(unique_id)
+        postal_code = "12345"
+        country = "United States"
+        return cls(
+            street_line1, street_line2, city, state, postal_code, country)

=== added file 'u1testutils/pay/environment.py'
--- u1testutils/pay/environment.py	1970-01-01 00:00:00 +0000
+++ u1testutils/pay/environment.py	2013-03-26 15:13:23 +0000
@@ -0,0 +1,20 @@
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from django.conf import settings
+
+
+def get_pay_base_url(default='http://localhost:8000'):
+    base_url = getattr(settings, 'PAY_SERVER_URL', default).rstrip('/')
+    return base_url

=== added directory 'u1testutils/pay/selftests'
=== added file 'u1testutils/pay/selftests/__init__.py'
=== added directory 'u1testutils/pay/selftests/unit'
=== added file 'u1testutils/pay/selftests/unit/__init__.py'
=== added file 'u1testutils/pay/selftests/unit/test_pay_api_client.py'
--- u1testutils/pay/selftests/unit/test_pay_api_client.py	1970-01-01 00:00:00 +0000
+++ u1testutils/pay/selftests/unit/test_pay_api_client.py	2013-03-26 15:13:23 +0000
@@ -0,0 +1,81 @@
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/
+
+import unittest
+
+import mock
+import payclient
+from piston_mini_client import failhandlers
+
+import u1testutils.django
+from u1testutils.pay import client
+from u1testutils.pay import data as pay_data
+from u1testutils.sst.sso import data as sso_data
+
+
+class APIClientTestCase(unittest.TestCase):
+
+    def test_get_api_client(self):
+        api_client = client.get_pay_client()
+        self.assertTrue(isinstance(api_client, payclient.PaymentServiceAPI))
+
+    def test_get_api_client_with_default_url(self):
+        api_client = client.get_pay_client()
+        self.assertEquals(
+            api_client._service_root, 'http://localhost:8000/api/2.0/')
+
+    def test_get_api_client_with_settings_url(self):
+        with u1testutils.django.patch_settings(
+                PAY_SERVER_URL='http://settings.pay.local:8000'):
+            api_client = client.get_pay_client()
+        self.assertEquals(
+            api_client._service_root,
+            'http://settings.pay.local:8000/api/2.0/')
+
+    def test_get_api_client_with_argument_url(self):
+        pay_server_url = 'http://argument.pay.local:8000'
+        api_client = client.get_pay_client(pay_server_url)
+        self.assertEquals(
+            api_client._service_root,
+            'http://argument.pay.local:8000/api/2.0/')
+
+    def test_get_api_client_with_argument_url_and_trailing_slash(self):
+        pay_server_url = 'http://argument.pay.local:8000/'
+        api_client = client.get_pay_client(pay_server_url)
+        self.assertEquals(
+            api_client._service_root,
+            'http://argument.pay.local:8000/api/2.0/')
+
+
+class CreditCardAPIClientTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.user = sso_data.User(
+            full_name='test', email='test', password='test', openid='test')
+        self.credit_card = pay_data.CreditCard.make_test_visa_card()
+        self.billing_address = pay_data.Address.make_unique()
+
+    def test_new_credit_card_added(self):
+        with mock.patch('payclient.PaymentServiceAPI.new_credit_card',
+                        return_value=payclient.CreditCardResponse()):
+            added = client.add_new_credit_card(
+                'TEST', self.user, self.credit_card, self.billing_address)
+        self.assertTrue(added)
+
+    def test_add_new_credit_card_failed(self):
+        with mock.patch('payclient.PaymentServiceAPI.new_credit_card',
+                        side_effect=failhandlers.APIError('test')):
+            added = client.add_new_credit_card(
+                'TEST', self.user, self.credit_card, self.billing_address)
+        self.assertFalse(added)

=== modified file 'u1testutils/selftests/django_project/settings.py'
--- u1testutils/selftests/django_project/settings.py	2013-01-21 03:26:21 +0000
+++ u1testutils/selftests/django_project/settings.py	2013-03-26 15:13:23 +0000
@@ -19,6 +19,10 @@
 IMAP_USE_SSL = False
 IMAP_SERVER = 'localhost'
 IMAP_PORT = 2143
+
 SSO_TEST_ACCOUNT_FULL_NAME = 'Test full name'
 SSO_TEST_ACCOUNT_EMAIL = '[e-mail]'
 SSO_TEST_ACCOUNT_PASSWORD = '7357 ¶@55\^/0rD'
+
+PAY_API_USERNAME = 'testuser'
+PAY_API_PASSWORD = 'testpassword'

=== modified file 'u1testutils/sst/__init__.py'
--- u1testutils/sst/__init__.py	2011-12-20 19:36:51 +0000
+++ u1testutils/sst/__init__.py	2013-03-26 15:13:23 +0000
@@ -0,0 +1,56 @@
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import sst.actions
+
+
+class Page(object):
+    """Base class for the page objects used in acceptance testing.
+
+    Instance variables:
+    title -- The title of the page.
+
+    """
+
+    title = None
+    headings1 = []
+    headings2 = []
+
+    def __init__(self):
+        super(Page, self).__init__()
+        self.assert_page_is_open()
+
+    def assert_page_is_open(self):
+        """Assert that the page is open."""
+        sst.actions.assert_title(self.title)
+        if self.headings1:
+            self.assert_headings1()
+        if self.headings2:
+            self.assert_headings2()
+
+    def assert_headings1(self):
+        """Assert the h1 elements of the page."""
+        self._assert_elements_text('h1', self.headings1)
+
+    def _assert_elements_text(self, tag, expected_text_list):
+        get_text = lambda x: x.text
+        page_elements_text = map(get_text, sst.actions.get_elements(tag=tag))
+        assert expected_text_list == page_elements_text, \
+            'Expected elements texts: {0}\n' \
+            'Actual elements texts: {1}'.format(
+                expected_text_list, page_elements_text)
+
+    def assert_headings2(self):
+        """Assert the h2 elements of the page."""
+        self._assert_elements_text('h2', self.headings2)

=== modified file 'u1testutils/sst/config.py'
--- u1testutils/sst/config.py	2013-03-13 15:55:37 +0000
+++ u1testutils/sst/config.py	2013-03-26 15:13:23 +0000
@@ -2,7 +2,14 @@
 from sst.actions import set_base_url
 
 
-def set_base_url_from_env(default_to='http://localhost:8000'):
+DEFAULT_BASE_URL = 'http://localhost:8000'
+
+
+def set_base_url_from_env(default_url=DEFAULT_BASE_URL):
     """Set the base URL for SST tests from the env or default."""
-    base_url = os.environ.get('SST_BASE_URL', default_to)
-    set_base_url(base_url.rstrip('/'))
+    set_base_url(get_base_url_from_env(default_url))
+
+
+def get_base_url_from_env(default_url=DEFAULT_BASE_URL):
+    base_url = os.environ.get('SST_BASE_URL', default_url)
+    return base_url.rstrip('/')

=== modified file 'u1testutils/sst/sso/__init__.py'
--- u1testutils/sst/sso/__init__.py	2013-02-26 20:38:37 +0000
+++ u1testutils/sst/sso/__init__.py	2013-03-26 15:13:23 +0000
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2012, 2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it

=== modified file 'u1testutils/sst/sso/client.py'
--- u1testutils/sst/sso/client.py	2013-02-27 22:47:32 +0000
+++ u1testutils/sst/sso/client.py	2013-03-26 15:13:23 +0000
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2012, 2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -13,6 +11,7 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 from ssoclient.v2 import V2ApiClient
 
 from u1testutils.sst.sso import environment

=== modified file 'u1testutils/sst/sso/data.py'
--- u1testutils/sst/sso/data.py	2013-02-14 19:53:25 +0000
+++ u1testutils/sst/sso/data.py	2013-03-26 15:13:23 +0000
@@ -42,6 +42,15 @@
         return self._openid
 
     @classmethod
+    def make_unique(cls, unique_id=None):
+        if unique_id is None:
+            unique_id = str(uuid.uuid1())
+        full_name = 'Test user ' + unique_id
+        email = 'test+{0}@example.com'.format(unique_id)
+        password = 'Hola123*'
+        return cls(full_name, email, password)
+
+    @classmethod
     def make_from_configuration(cls, new_user=False):
         """Return a user taking its credentials from the configuration files.
 

=== modified file 'u1testutils/sst/sso/environment.py'
--- u1testutils/sst/sso/environment.py	2013-02-14 19:51:37 +0000
+++ u1testutils/sst/sso/environment.py	2013-03-26 15:13:23 +0000
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2012, 2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it

=== modified file 'u1testutils/sst/sso/pages.py'
--- u1testutils/sst/sso/pages.py	2013-02-26 20:51:33 +0000
+++ u1testutils/sst/sso/pages.py	2013-03-26 15:13:23 +0000
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -16,27 +14,10 @@
 
 import sst.actions
 
-
-class Page(object):
-    """Base class for the page objects used in acceptance testing.
-
-    Instance variables:
-    title -- The title of the page.
-
-    """
-
-    title = None
-
-    def __init__(self):
-        super(Page, self).__init__()
-        self.assert_page_is_open()
-
-    def assert_page_is_open(self):
-        """Assert that the page is open."""
-        sst.actions.assert_title(self.title)
-
-
-class LogIn(Page):
+import u1testutils.sst
+
+
+class LogIn(u1testutils.sst.Page):
     """Log in page of the Ubuntu Single Sign On website.
 
     This is a subclass of the Page object. It extends the assert_page_is_open
@@ -111,7 +92,7 @@
         return CreateAccount()
 
 
-class CreateAccount(Page):
+class CreateAccount(u1testutils.sst.Page):
     """Create account page of the Ubuntu Single Sign On website.
 
     This is a subclass of the Page object. It adds methods for the actions
@@ -146,7 +127,7 @@
         sst.actions.click_button(continue_button)
 
 
-class RegistrationMailSent(Page):
+class RegistrationMailSent(u1testutils.sst.Page):
     """Registration mail sent page of the Ubuntu Single Sign On website.
 
     This is a subclass of the Page object. It extends the assert_page_is_open
@@ -200,7 +181,7 @@
         sst.actions.click_button(continue_button)
 
 
-class ValidateEmail(Page):
+class ValidateEmail(u1testutils.sst.Page):
     """Validate email address confirmation page.
 
     This is a subclass of the Page object. It adds methods for the actions
@@ -234,7 +215,7 @@
         return YourAccount(self.user_name)
 
 
-class SiteNotRecognized(Page):
+class SiteNotRecognized(u1testutils.sst.Page):
     """Site not Recognized page of the Ubuntu Single Sign On website.
 
     This is a subclass of the Page object. It overrides the assert_page_is_open
@@ -281,7 +262,7 @@
         sst.actions.click_button(sign_me_in_button)
 
 
-class YourAccount(Page):
+class YourAccount(u1testutils.sst.Page):
     """Your account page of the Ubuntu Single Sign On website.
 
     This is a subclass of the Page object. It extends the constructor to
@@ -312,7 +293,7 @@
         return YouHaveBeenLoggedOut()
 
 
-class YouHaveBeenLoggedOut(Page):
+class YouHaveBeenLoggedOut(u1testutils.sst.Page):
     """Your account page of the Ubuntu Single Sign On website.
 
     This is a subclass of the Page object.

=== modified file 'u1testutils/sst/sso/selftests/unit/test_client.py'
--- u1testutils/sst/sso/selftests/unit/test_client.py	2013-02-27 22:47:32 +0000
+++ u1testutils/sst/sso/selftests/unit/test_client.py	2013-03-26 15:13:23 +0000
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2012, 2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it