--- a/cwvreg.py	Mon Apr 14 11:54:33 2014 +0200
+++ b/cwvreg.py	Mon Apr 14 12:07:00 2014 +0200
@@ -753,7 +753,7 @@
             return self.property_info(key)['default']
 
     def typed_value(self, key, value):
-        """value is an unicode string, return it correctly typed. Let potential
+        """value is a unicode string, return it correctly typed. Let potential
         type error propagates.
         """
         pdef = self.property_info(key)

--- a/dbapi.py	Mon Apr 14 11:54:33 2014 +0200
+++ b/dbapi.py	Mon Apr 14 12:07:00 2014 +0200
@@ -471,7 +471,7 @@
         """execute a rql query, return resulting rows and their description in
         a :class:`~cubicweb.rset.ResultSet` object
 
-        * `rql` should be an Unicode string or a plain ASCII string, containing
+        * `rql` should be a Unicode string or a plain ASCII string, containing
           the rql query
 
         * `args` the optional args dictionary associated to the query, with key

--- a/server/querier.py	Mon Apr 14 11:54:33 2014 +0200
+++ b/server/querier.py	Mon Apr 14 12:07:00 2014 +0200
@@ -554,7 +554,7 @@
         """execute a rql query, return resulting rows and their description in
         a `ResultSet` object
 
-        * `rql` should be an Unicode string or a plain ASCII string
+        * `rql` should be a Unicode string or a plain ASCII string
         * `args` the optional parameters dictionary associated to the query
         * `build_descr` is a boolean flag indicating if the description should
           be built on select queries (if false, the description will be en empty

--- a/server/repository.py	Mon Apr 14 11:54:33 2014 +0200
+++ b/server/repository.py	Mon Apr 14 12:07:00 2014 +0200
@@ -781,7 +781,7 @@
                 txid=None):
         """execute a RQL query
 
-        * rqlstring should be an unicode string or a plain ascii string
+        * rqlstring should be a unicode string or a plain ascii string
         * args the optional parameters used in the query
         * build_descr is a flag indicating if the description should be
           built on select queries

--- a/server/sources/extlite.py	Mon Apr 14 11:54:33 2014 +0200
+++ b/server/sources/extlite.py	Mon Apr 14 12:07:00 2014 +0200
@@ -288,7 +288,7 @@
             print 'exec', query, args
         cursor = session.cnxset[self.uri]
         try:
-            # str(query) to avoid error if it's an unicode string
+            # str(query) to avoid error if it's a unicode string
             cursor.execute(str(query), args)
         except Exception as ex:
             self.critical("sql: %r\n args: %s\ndbms message: %r",

--- a/server/sources/native.py	Mon Apr 14 11:54:33 2014 +0200
+++ b/server/sources/native.py	Mon Apr 14 12:07:00 2014 +0200
@@ -739,7 +739,7 @@
             # instance
             print 'exec', query, args, getattr(cnx, '_cnx', cnx)
         try:
-            # str(query) to avoid error if it's an unicode string
+            # str(query) to avoid error if it's a unicode string
             cursor.execute(str(query), args)
         except Exception as ex:
             if self.repo.config.mode != 'test':
@@ -779,7 +779,7 @@
             print 'execmany', query, 'with', len(args), 'arguments'
         cursor = session.cnxset[self.uri]
         try:
-            # str(query) to avoid error if it's an unicode string
+            # str(query) to avoid error if it's a unicode string
             cursor.executemany(str(query), args)
         except Exception as ex:
             if self.repo.config.mode != 'test':

--- a/web/formfields.py	Mon Apr 14 11:54:33 2014 +0200
+++ b/web/formfields.py	Mon Apr 14 12:07:00 2014 +0200
@@ -382,7 +382,7 @@
         called by widgets which requires a vocabulary.
 
         It should return a list of tuple (label, value), where value
-        *must be an unicode string*, not a typed value.
+        *must be a unicode string*, not a typed value.
         """
         assert self.choices is not None
         if callable(self.choices):

--- a/web/formwidgets.py	Mon Apr 14 11:54:33 2014 +0200
+++ b/web/formwidgets.py	Mon Apr 14 12:07:00 2014 +0200
@@ -310,7 +310,7 @@
 # basic html widgets ###########################################################
 
 class TextInput(Input):
-    """Simple <input type='text'>, will return an unicode string."""
+    """Simple <input type='text'>, will return a unicode string."""
     type = 'text'
 
 
@@ -373,7 +373,7 @@
 
 
 class HiddenInput(Input):
-    """Simple <input type='hidden'> for hidden value, will return an unicode
+    """Simple <input type='hidden'> for hidden value, will return a unicode
     string.
     """
     type = 'hidden'
@@ -382,7 +382,7 @@
 
 
 class ButtonInput(Input):
-    """Simple <input type='button'>, will return an unicode string.
+    """Simple <input type='button'>, will return a unicode string.
 
     If you want a global form button, look at the :class:`Button`,
     :class:`SubmitButton`, :class:`ResetButton` and :class:`ImgButton` below.
@@ -391,7 +391,7 @@
 
 
 class TextArea(FieldWidget):
-    """Simple <textarea>, will return an unicode string."""
+    """Simple <textarea>, will return a unicode string."""
 
     def _render(self, form, field, renderer):
         values, attrs = self.values_and_attributes(form, field)
@@ -413,7 +413,7 @@
 
 
 class FCKEditor(TextArea):
-    """FCKEditor enabled <textarea>, will return an unicode string containing
+    """FCKEditor enabled <textarea>, will return a unicode string containing
     HTML formated text.
     """
     def __init__(self, *args, **kwargs):
@@ -427,7 +427,7 @@
 
 class Select(FieldWidget):
     """Simple <select>, for field having a specific vocabulary. Will return
-    an unicode string, or a list of unicode strings.
+    a unicode string, or a list of unicode strings.
     """
     vocabulary_widget = True
     default_size = 10
@@ -623,7 +623,7 @@
 
 class DateTimePicker(TextInput):
     """<input type='text'> + javascript date/time picker for date or datetime
-    fields. Will return the date or datetime as an unicode string.
+    fields. Will return the date or datetime as a unicode string.
     """
     monthnames = ('january', 'february', 'march', 'april',
                   'may', 'june', 'july', 'august',
@@ -665,7 +665,7 @@
 
 class JQueryDatePicker(FieldWidget):
     """Use jquery.ui.datepicker to define a date picker. Will return the date as
-    an unicode string.
+    a unicode string.
     """
     needs_js = ('jquery.ui.js', )
     needs_css = ('jquery.ui.css',)

--- a/web/views/forms.py	Mon Apr 14 11:54:33 2014 +0200
+++ b/web/views/forms.py	Mon Apr 14 12:07:00 2014 +0200
@@ -185,7 +185,7 @@
     def render(self, formvalues=None, renderer=None, **kwargs):
         """Render this form, using the `renderer` given as argument or the
         default according to :attr:`form_renderer_id`. The rendered form is
-        returned as an unicode string.
+        returned as a unicode string.
 
         `formvalues` is an optional dictionary containing values that will be
         considered as field's value.

--- a/web/views/magicsearch.py	Mon Apr 14 11:54:33 2014 +0200
+++ b/web/views/magicsearch.py	Mon Apr 14 12:07:00 2014 +0200
@@ -201,7 +201,7 @@
     priority = 4
 
     def preprocess_query(self, uquery):
-        """try to get rql from an unicode query string"""
+        """try to get rql from a unicode query string"""
         args = None
         try:
             # Process as if there was a quoted part