strings compatible with python 3.2

larigira/audioform_script.py

@@ -3,13 +3,13 @@ from wtforms import StringField, validators, SubmitField, ValidationError
 
 
 class ScriptAudioForm(Form):
-    nick = StringField(u'Audio nick', validators=[validators.required()],
+    nick = StringField('Audio nick', validators=[validators.required()],
                        description='A simple name to recognize this audio')
-    name = StringField(u'Name', validators=[validators.required()],
+    name = StringField('Name', validators=[validators.required()],
                        description='filename (NOT path) of the script')
-    args = StringField(u'Arguments',
+    args = StringField('Arguments',
                        description='arguments, separated by spaces')
-    submit = SubmitField(u'Submit')
+    submit = SubmitField('Submit')
 
     def populate_from_audiospec(self, audiospec):
         if 'nick' in audiospec:

larigira/audioform_static.py

@@ -5,11 +5,11 @@ from wtforms import StringField, validators, SubmitField
 
 
 class StaticAudioForm(Form):
-    nick = StringField(u'Audio nick', validators=[validators.required()],
+    nick = StringField('Audio nick', validators=[validators.required()],
                        description='A simple name to recognize this audio')
-    path = StringField(u'Path', validators=[validators.required()],
+    path = StringField('Path', validators=[validators.required()],
                        description='Full path to audio file')
-    submit = SubmitField(u'Submit')
+    submit = SubmitField('Submit')
 
     def populate_from_audiospec(self, audiospec):
         if 'nick' in audiospec:

larigira/audiogen_randomdir.py

@@ -46,4 +46,4 @@ def generate(spec):
                       prefix='audiogen-randomdir-')
         os.close(tmp[0])
         shutil.copy(path, tmp[1])
-        yield u'file://{}'.format(tmp[1])
+        yield 'file://{}'.format(tmp[1])

larigira/audiogen_static.py

@@ -21,4 +21,4 @@ def generate(spec):
                       prefix='audiogen-static-')
         os.close(tmp[0])
         shutil.copy(path, tmp[1])
-        yield u'file://{}'.format(tmp[1])
+        yield 'file://{}'.format(tmp[1])

larigira/timeform_frequency.py

@@ -7,21 +7,21 @@ from wtforms import StringField, DateTimeField, validators, \
 
 
 class FrequencyAlarmForm(Form):
-    nick = StringField(u'Alarm nick', validators=[validators.required()],
+    nick = StringField('Alarm nick', validators=[validators.required()],
                        description='A simple name to recognize this alarm')
-    start = DateTimeField(u'Start date and time',
+    start = DateTimeField('Start date and time',
                           validators=[validators.required()],
                           description='Date before which no alarm will ring, '
                           'expressed as YYYY-MM-DD HH:MM:SS')
-    end = DateTimeField(u'End date and time',
+    end = DateTimeField('End date and time',
                         validators=[validators.optional()],
                         description='Date after which no alarm will ring, '
                         'expressed as YYYY-MM-DD HH:MM:SS')
-    interval = StringField(u'Frequency',
+    interval = StringField('Frequency',
                            validators=[validators.required()],
                            description='in seconds, or human-readable '
                            '(like 9w3d12h)')
-    submit = SubmitField(u'Submit')
+    submit = SubmitField('Submit')
 
     def populate_from_timespec(self, timespec):
         if 'nick' in timespec:

larigira/timeform_single.py

@@ -5,12 +5,12 @@ from wtforms import StringField, DateTimeField, validators, SubmitField
 
 
 class SingleAlarmForm(Form):
-    nick = StringField(u'Alarm nick', validators=[validators.required()],
+    nick = StringField('Alarm nick', validators=[validators.required()],
                        description='A simple name to recognize this alarm')
-    dt = DateTimeField(u'Date and time', validators=[validators.required()],
+    dt = DateTimeField('Date and time', validators=[validators.required()],
                        description='Date to ring on, expressed as '
                        'YYYY-MM-DD HH:MM:SS')
-    submit = SubmitField(u'Submit')
+    submit = SubmitField('Submit')
 
     def populate_from_timespec(self, timespec):
         if 'nick' in timespec: