Merge lp:~elopio/ubuntu-calendar-app/fix1334777-pep8 into lp:ubuntu-calendar-app

[Leo Arias]

Fixed the new new pep8 errors and the copyright headers.

Fixed the new new pep8 errors and the copyright headers

[Mihir Soni (mihirsoni)]

Looks good to me thanks.

review: Approve

[Julia Palandri (julia-palandri)]

ran pep8 and read diff, everything looks good

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:335
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/566/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/673
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/673/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/124

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/566/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py	2013-05-29 09:26:13 +0000
+++ tests/autopilot/calendar_app/__init__.py	2014-06-26 18:11:36 +0000
@@ -1,8 +1,17 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
+#
+# Copyright (C) 2013, 2014 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU 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/>.
 
 """calendar-app tests and emulators - top level package."""

=== modified file 'tests/autopilot/calendar_app/emulators.py'
--- tests/autopilot/calendar_app/emulators.py	2014-06-06 18:08:55 +0000
+++ tests/autopilot/calendar_app/emulators.py	2014-06-26 18:11:36 +0000
@@ -1,9 +1,18 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
+#
+# Copyright (C) 2013, 2014 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU 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/>.
 
 """Calendar app autopilot emulators."""
 from time import sleep
@@ -22,9 +31,9 @@
     """Autopilot helper for the NewEventEntryField component."""
 
 
-#for now we are borrowing the textfield helper for the textarea
-#once the toolkit has a textarea helper this should be removed
-#https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1327354
+# for now we are borrowing the textfield helper for the textarea
+# once the toolkit has a textarea helper this should be removed
+# https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1327354
 class TextArea(toolkit_emulators.TextField):
     """Autopilot helper for the TextArea component."""
 
@@ -36,7 +45,7 @@
     """
 
     def set_picker(self, field, mode, value):
-        #open picker
+        # open picker
         self.pointing_device.click_object(field)
         # valid options are date or time; assume date if invalid/no option
         if mode == 'time':
@@ -49,7 +58,7 @@
             picker.pick_time(value)
         else:
             picker.pick_date(value)
-        #close picker
+        # close picker
         self.pointing_device.click_object(field)
 
     def get_event_view(self):
@@ -130,11 +139,11 @@
         """
         timeout = 0
         before = date
-        #try up to 3 times to swipe
+        # try up to 3 times to swipe
         while timeout < 3 and date == before:
             self._swipe(direction, view)
-            #check for up to 3 seconds after swipe for view
-            #to have changed before trying again
+            # check for up to 3 seconds after swipe for view
+            # to have changed before trying again
             for x in range(0, 3):
                 if date != before:
                     break

=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/calendar_app/tests/__init__.py	2014-06-18 09:03:51 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py	2014-06-26 18:11:36 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013 Canonical Ltd
+# Copyright (C) 2013, 2014 Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -102,10 +102,10 @@
     def _copy_xauthority_file(self, directory):
         """ Copy .Xauthority file to directory, if it exists in /home
         """
-        #If running under xvfb, as jenkins does,
-        #xsession will fail to start without xauthority file
-        #Thus if the Xauthority file is in the home directory
-        #make sure we copy it to our temp home directory
+        # If running under xvfb, as jenkins does,
+        # xsession will fail to start without xauthority file
+        # Thus if the Xauthority file is in the home directory
+        # make sure we copy it to our temp home directory
 
         xauth = os.path.expanduser(os.path.join(os.environ.get('HOME'),
                                    '.Xauthority'))
@@ -119,8 +119,8 @@
     def _patch_home(self):
         """ mock /home for testing purposes to preserve user data
         """
-        #click requires apparmor profile, and writing to special dir
-        #but the desktop can write to a traditional /tmp directory
+        # click requires apparmor profile, and writing to special dir
+        # but the desktop can write to a traditional /tmp directory
         if self.test_type == 'click':
             env_dir = os.path.join(os.environ.get('HOME'), 'autopilot',
                                    'fakeenv')
@@ -131,8 +131,8 @@
             temp_dir_fixture = fixtures.TempDir(env_dir)
             self.useFixture(temp_dir_fixture)
 
-            #apparmor doesn't allow the app to create needed directories,
-            #so we create them now
+            # apparmor doesn't allow the app to create needed directories,
+            # so we create them now
             temp_dir = temp_dir_fixture.path
             temp_dir_cache = os.path.join(temp_dir, '.cache')
             temp_dir_cache_font = os.path.join(temp_dir_cache, 'fontconfig')
@@ -165,7 +165,7 @@
             if not os.path.exists(temp_dir_confined):
                 os.makedirs(temp_dir_confined)
 
-            #before we set fixture, copy xauthority if needed
+            # before we set fixture, copy xauthority if needed
             self._copy_xauthority_file(temp_dir)
             self.useFixture(toolkit_fixtures.InitctlEnvironmentVariable(
                             HOME=temp_dir))
@@ -174,7 +174,7 @@
             self.useFixture(temp_dir_fixture)
             temp_dir = temp_dir_fixture.path
 
-            #before we set fixture, copy xauthority if needed
+            # before we set fixture, copy xauthority if needed
             self._copy_xauthority_file(temp_dir)
             self.useFixture(fixtures.EnvironmentVariable('HOME',
                                                          newvalue=temp_dir))

=== modified file 'tests/autopilot/calendar_app/tests/test_calendar.py'
--- tests/autopilot/calendar_app/tests/test_calendar.py	2014-06-17 16:23:49 +0000
+++ tests/autopilot/calendar_app/tests/test_calendar.py	2014-06-26 18:11:36 +0000
@@ -1,9 +1,18 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
+#
+# Copyright (C) 2013, 2014 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU 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/>.
 
 """Calendar app autopilot tests."""
 
@@ -13,89 +22,57 @@
 from calendar_app.tests import CalendarTestCase
 
 import time
-#import datetime
 
 
 class TestMainView(CalendarTestCase):
 
     def test_new_event(self):
         """test add new event """
-        #go to today
+        # go to today
         self.main_view.switch_to_tab("dayTab")
         header = self.main_view.get_header()
         header.click_action_button('todaybutton')
         num_events = self.main_view.get_num_events()
 
-        # calculate some dates
-        #today = self.main_view.get_day_view().currentDay.datetime
-        #yesterday = today + datetime.timedelta(days=-1)
-        #tomorrow = today + datetime.timedelta(days=1)
-
-        #start_time = datetime.time(6, 5)
-        #end_time = datetime.time(11, 38)
-
-        #click on new event button
+        # click on new event button
         header = self.main_view.get_header()
         header.click_action_button('neweventbutton')
         self.assertThat(self.main_view.get_new_event,
                         Eventually(Not(Is(None))))
 
-        #due to https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1326963
-        #the first event triggered is ignored, so we trigger an event
-        #and a small sleep to clear before continuing input
+        # due to https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1326963
+        # the first event triggered is ignored, so we trigger an event
+        # and a small sleep to clear before continuing input
         event_name_field = self.main_view.get_new_event_name_input_box()
         self.pointing_device.click_object(event_name_field)
         time.sleep(1)
 
-        #due to https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1328600
-        #we cannot interact to set date / time, so disabling this for now
-
-        # Set the start date
-        #self.main_view.set_picker(self.main_view.get_event_start_date_field(),
-        #                          'date',
-        #                          yesterday)
-
-        # Set the end date
-        #self.main_view.set_picker(self.main_view.get_event_end_date_field(),
-        #                          'date',
-        #                          tomorrow)
-
-        # Set the start time
-        #self.main_view.set_picker(self.main_view.get_event_start_time_field(),
-        #                          'time',
-        #                          start_time)
-
-        # Set the end time
-        #self.main_view.set_picker(self.main_view.get_event_end_time_field(),
-        #                          'time',
-        #                          end_time)
-
-        #input a new event name
+        # input a new event name
         eventTitle = "Test event " + str(int(time.time()))
         self.main_view.get_new_event_name_input_box().write(eventTitle)
 
-        #input description
+        # input description
         self.main_view.get_event_description_field(). \
             write("My favorite test event")
 
-        #input location
+        # input location
         self.main_view.get_event_location_field().write("England")
 
-        #input guests
+        # input guests
         self.main_view.get_event_people_field().write("me, myself, and I")
 
-        #todo: iterate over all combinations
-        #and include recurrence and reminders
+        # todo: iterate over all combinations
+        # and include recurrence and reminders
 
-        #click save button
+        # click save button
         save_button = self.main_view.get_new_event_save_button()
         self.pointing_device.click_object(save_button)
 
-        #verify that the event has been created in timeline
+        # verify that the event has been created in timeline
         self.main_view.switch_to_tab("dayTab")
         header = self.main_view.get_header()
         header.click_action_button('todaybutton')
         self.assertThat(self.main_view.get_num_events,
                         Eventually(NotEquals(num_events)))
 
-        #todo: verify entered event data
+        # todo: verify entered event data

=== modified file 'tests/autopilot/calendar_app/tests/test_dayview.py'
--- tests/autopilot/calendar_app/tests/test_dayview.py	2014-05-22 11:51:53 +0000
+++ tests/autopilot/calendar_app/tests/test_dayview.py	2014-06-26 18:11:36 +0000
@@ -1,9 +1,18 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
+#
+# Copyright (C) 2013, 2014 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU 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/>.
 
 """
 Calendar app autopilot tests for the day view.
@@ -81,7 +90,7 @@
         firstday = self.day_view.currentDay.datetime
 
         for i in range(1, 5):
-            #prevent timing issues with swiping
+            # prevent timing issues with swiping
             old_day = self.day_view.currentDay.datetime
             self.main_view.swipe_view(direction, self.day_view)
             self.assertThat(lambda: self.day_view.currentDay.datetime,

=== modified file 'tests/autopilot/calendar_app/tests/test_monthview.py'
--- tests/autopilot/calendar_app/tests/test_monthview.py	2014-05-23 12:00:18 +0000
+++ tests/autopilot/calendar_app/tests/test_monthview.py	2014-06-26 18:11:36 +0000
@@ -1,9 +1,18 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
+#
+# Copyright (C) 2013, 2014 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU 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/>.
 
 """Calendar app autopilot tests."""
 
@@ -40,7 +49,7 @@
             before = self.main_view.to_local_date(
                 month_view.currentMonth.datetime)
 
-            #prevent timing issues with swiping
+            # prevent timing issues with swiping
             old_month = self.main_view.to_local_date(
                 month_view.currentMonth.datetime)
 

=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
--- tests/autopilot/calendar_app/tests/test_weekview.py	2014-05-22 09:34:33 +0000
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2014-06-26 18:11:36 +0000
@@ -1,9 +1,18 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
+#
+# Copyright (C) 2013, 2014 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU 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/>.
 
 """
 Calendar app autopilot tests for the week view.
@@ -40,7 +49,7 @@
     def _change_week(self, direction):
         first_dow = self._get_first_day_of_week()
 
-        #prevent timing issues with swiping
+        # prevent timing issues with swiping
         old_day = self.main_view.to_local_date(
             self.week_view.dayStart.datetime)
         self.main_view.swipe_view(direction, self.week_view)
@@ -58,13 +67,13 @@
         self.assertThat(new_day_start.day, Equals(expected_day_start.day))
 
     def _get_days_of_week(self):
-        #sort based on text value of the day
+        # sort based on text value of the day
         days = sorted(self._get_date_label_headers(),
                       key=lambda label: label.text)
         days = [int(item.text) for item in days]
 
-        #resort so beginning of next month comes after the end
-        #need to support overlapping months 28,30,31 -> 1
+        # resort so beginning of next month comes after the end
+        # need to support overlapping months 28,30,31 -> 1
         sorteddays = []
         for day in days:
             inserted = 0
@@ -89,23 +98,23 @@
         firstDay = self.main_view.to_local_date(
             self.week_view.firstDay.datetime)
 
-        #sunday
+        # sunday
         if firstDay.weekday() == 6:
             logger.debug("Locale has Sunday as first day of week")
             weekday = date.weekday()
             diff = datetime.timedelta(days=weekday + 1)
-        #saturday
+        # saturday
         elif firstDay.weekday() == 5:
             logger.debug("Locale has Saturday as first day of week")
             weekday = date.weekday()
             diff = datetime.timedelta(days=weekday + 2)
-        #monday
+        # monday
         else:
             logger.debug("Locale has Monday as first day of week")
             weekday = date.weekday()
             diff = datetime.timedelta(days=weekday)
 
-        #set the start of week
+        # set the start of week
         if date.day != firstDay.day:
             day_start = date - diff
             logger.debug("Setting day_start to %s" % firstDay.day)
@@ -172,11 +181,11 @@
 
         self.pointing_device.click_object(day_to_select)
 
-        #Check that the view changed from 'Week' to 'Day'
+        # Check that the view changed from 'Week' to 'Day'
         day_view = self.main_view.get_day_view()
         self.assertThat(day_view.visible, Eventually(Equals(True)))
 
-        #Check that the 'Day' view is on the correct/selected day.
+        # Check that the 'Day' view is on the correct/selected day.
         selected_date = day_view.select_single("TimeLineHeader").date
         self.assertThat(expected_day, Equals(selected_date.day))
         self.assertThat(expected_month, Equals(selected_date.month))

=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
--- tests/autopilot/calendar_app/tests/test_yearview.py	2014-05-22 09:34:33 +0000
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2014-06-26 18:11:36 +0000
@@ -1,9 +1,18 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
+#
+# Copyright (C) 2013, 2014 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU 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/>.
 
 """
 Calendar app autopilot tests for the year view.
@@ -46,7 +55,7 @@
         self.assertThat(year_grid, NotEquals(None))
         months = year_grid.select_many("MonthComponent")
         months.sort(key=lambda month: month.currentMonth)
-        #check that current year is the default
+        # check that current year is the default
         self.assertThat(self.main_view.get_year(months[0]),
                         Equals(datetime.now().year))