Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 856f2259f4f174a7433fbffae058b44d9ecd38e9
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Jan 18 23:34:45 2013 +0100
Code layout fixes
---------------------------------------------------------------
fedocal/__init__.py | 12 ++++++------
fedocal/fedocallib/__init__.py | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index 1ba4b2f..bf79ee6 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -411,7 +411,7 @@ def edit_meeting(meeting_id):
return flask.redirect(flask.url_for('index'))
if not flask.g.fas_user.username in \
Meeting.get_managers(SESSION, meeting_id):
- flask.flash('You are not one of the manager of this meeting, '\
+ flask.flash('You are not one of the manager of this meeting, '
'you are not allowed to edit it.')
return flask.redirect(flask.url_for('index'))
meeting = Meeting.by_id(SESSION, meeting_id)
@@ -446,7 +446,7 @@ def edit_meeting(meeting_id):
tzone=tzone)
except SQLAlchemyError, err:
SESSION.rollback()
- print 'edit_meeting:', err
+ print 'edit_meeting:', err
flask.flash('Could not update this meeting.')
return flask.render_template('edit_meeting.html',
meeting=meeting, calendar=calendarobj, form=form,
@@ -470,7 +470,7 @@ def edit_meeting(meeting_id):
meeting = meetingobj
if not fedocallib.is_date_in_future(meeting.meeting_date,
meeting.meeting_time_start):
- flask.flash('This meeting has already occured, you may not '\
+ flask.flash('This meeting has already occured, you may not '
'change it anymore')
return flask.redirect(flask.url_for('my_meetings'))
form = forms.AddMeetingForm(meeting=meeting, tzone=get_timezone())
@@ -528,7 +528,7 @@ def delete_meeting(meeting_id):
SESSION.commit()
except SQLAlchemyError, err:
SESSION.rollback()
- print 'edit_meeting:', err
+ print 'edit_meeting:', err
flask.flash('Could not update this meeting.')
flask.flash('Meeting deleted')
return flask.redirect(flask.url_for('calendar',
@@ -559,7 +559,7 @@ def delete_calendar(calendar_name):
SESSION.commit()
except SQLAlchemyError, err:
SESSION.rollback()
- print 'delete_calendar:', err
+ print 'delete_calendar:', err
flask.flash('Could not delete this calendar.')
flask.flash('Calendar deleted')
return flask.redirect(flask.url_for('index'))
@@ -596,7 +596,7 @@ def edit_calendar(calendar_name):
SESSION.commit()
except SQLAlchemyError, err:
SESSION.rollback()
- print 'edit_calendar:', err
+ print 'edit_calendar:', err
flask.flash('Could not update this calendar.')
return flask.render_template('edit_calendar.html', form=form,
calendar=calendarobj)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index e4a6542..cffbc4c 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -681,11 +681,11 @@ def add_meeting(session, calendarobj, fas_user,
"""
if not is_user_managing_in_calendar(session,
calendarobj.calendar_name, fas_user):
- raise UserNotAllowed('You are not allowed to add'\
+ raise UserNotAllowed('You are not allowed to add'
' a meeting to this calendar')
if not is_date_in_future(meeting_date, meeting_time_start):
- raise InvalidMeeting('The date you entered is in '\
+ raise InvalidMeeting('The date you entered is in '
'the past')
if meeting_time_start > meeting_time_stop:
@@ -759,7 +759,7 @@ def add_meeting(session, calendarobj, fas_user,
def edit_meeting(session, meeting, calendarobj, fas_user,
- meeting_name, meeting_date, meeting_date_end,
+ meeting_name, meeting_date, meeting_date_end,
meeting_time_start, meeting_time_stop, comanager,
meeting_information,
meeting_region, tzone,
@@ -772,11 +772,11 @@ def edit_meeting(session, meeting, calendarobj, fas_user,
"""
if not is_user_managing_in_calendar(session,
calendarobj.calendar_name, fas_user):
- raise UserNotAllowed('You are not allowed to add'\
+ raise UserNotAllowed('You are not allowed to add'
' a meeting to this calendar')
if not is_date_in_future(meeting_date, meeting_time_start):
- raise InvalidMeeting('The date you entered is in '\
+ raise InvalidMeeting('The date you entered is in '
'the past')
if meeting_time_start > meeting_time_stop: