Revision: 4179
Author: pekka.klarck
Date: Wed Sep 29 14:48:01 2010
Log: pisteen nussintaa
http://code.google.com/p/robotframework/source/detail?r=4179
Modified:
/trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/employeestore.py
/trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/ui.py
/trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/vacalcapp.py
=======================================
--- /trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/employeestore.py Wed
Sep 29 13:13:34 2010
+++ /trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/employeestore.py Wed
Sep 29 14:48:01 2010
@@ -28,15 +28,15 @@
try:
return self._employees[name]
except KeyError:
- raise VacalcError("Employee '%s' not found" % name)
+ raise VacalcError("Employee '%s' not found." % name)
def get_all_employees(self):
return self._employees.values()
def add_employee(self, name, startdate):
if name in self._employees:
- raise VacalcError("Employee '%s' already exists in the
system" %
- name)
+ raise VacalcError("Employee '%s' already exists in the system."
+ % name)
employee = Employee(name, self._parse_date(startdate))
self._employees[employee.name] = employee
self._serialize(employee)
@@ -53,11 +53,11 @@
try:
year, month, day = (int(item) for item in
datestring.split('-'))
except ValueError:
- raise VacalcError("Invalid time string '%s'" % datestring)
+ raise VacalcError("Invalid time string '%s'." % datestring)
try:
return datetime.date(year, month, day)
except ValueError, err:
- raise VacalcError(err.args[0].capitalize())
+ raise VacalcError(err.args[0].capitalize() + '.')
class Employee(object):
=======================================
--- /trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/ui.py Wed Sep 29
14:16:25 2010
+++ /trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/ui.py Wed Sep 29
14:48:01 2010
@@ -112,7 +112,7 @@
self._start_date_editor.getText())
def employee_added(self, employee):
- self._status_label.setText("Employee '%s' was added
successfully" % employee.name)
+ self._status_label.setText("Employee '%s' was added
successfully." % employee.name)
def adding_employee_failed(self, reason):
self._status_label.setText(reason)
=======================================
--- /trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/vacalcapp.py Wed Sep
29 13:11:57 2010
+++ /trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/vacalcapp.py Wed Sep
29 14:48:01 2010
@@ -10,8 +10,8 @@
class VacalcApplication(VacationCalculator):
def create(self):
- db_file = os.environ.get('VACALC_DB',
os.path.join(tempfile.gettempdir(),
- 'vacalcdb.csv'))
+ default_db = os.path.join(tempfile.gettempdir(), 'vacalcdb.csv')
+ db_file = os.environ.get('VACALC_DB', default_db)
store = EmployeeStore(db_file)
self._frame = VacalcFrame(EmployeeController(store))
self._frame.show()
