Typo fix

1 files changed, 41 insertions, 41 deletions

diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index 636ad26f0..f5c5f3b06 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -154,7 +154,7 @@ def new_qa_item(model, frm, many=False,
         if model.SLUG == "site":
             slug = "archaeologicalsite"
         url_slug = "new-" + slug
-        dct = {'page_name': str(_(u'New %s' % model_name.lower())),
+        dct = {'page_name': str(_('New %s' % model_name.lower())),
                'url': reverse(url_slug, args=[parent_name]),
                'slug': slug,
                'parent_name': parent_name,
@@ -271,8 +271,8 @@ def show_item(model, name, extra_dct=None, model_for_perms=None):
         except (ObjectDoesNotExist, ValueError):
             return HttpResponse('')
         doc_type = 'type' in dct and dct.pop('type')
-        url_name = u"/".join(reverse('show-' + name, args=['0', '']
-                                     ).split('/')[:-2]) + u"/"
+        url_name = "/".join(reverse('show-' + name, args=['0', '']
+                                    ).split('/')[:-2]) + "/"
         profile = get_current_profile()
         dct['PROFILE'] = profile
         dct['CURRENCY'] = profile.currency
@@ -288,7 +288,7 @@ def show_item(model, name, extra_dct=None, model_for_perms=None):
 
         # list current perms
         if hasattr(request.user, 'ishtaruser') and request.user.ishtaruser:
-            cache_key = u"{}-{}-{}".format(
+            cache_key = "{}-{}-{}".format(
                 settings.PROJECT_SLUG, "current-perms",
                 request.session.session_key,
             )
@@ -457,16 +457,16 @@ def _push_to_list(obj, current_group, depth):
         current_group.append(obj)
 
 
-true_strings = [u"1", u"true"]
+true_strings = ["1", "true"]
 for language_code, language_lbl in settings.LANGUAGES:
     activate(language_code)
-    true_strings.append(str(_(u"Yes")).lower())
-    true_strings.append(str(_(u"True")).lower())
+    true_strings.append(str(_("Yes")).lower())
+    true_strings.append(str(_("True")).lower())
     deactivate()
 
 
 def is_true_string(val):
-    val = str(val).lower().replace(u'"', u"")
+    val = str(val).lower().replace('"', "")
     if val in true_strings:
         return True
 
@@ -482,13 +482,13 @@ def _parse_parentheses(s):
 
     inside_quote = False
     for char in s:
-        if char == u'"':
+        if char == '"':
             inside_quote = not inside_quote
         if not inside_quote:
-            if char == u'(':
+            if char == '(':
                 _push_to_list([], groups, depth)
                 depth += 1
-            elif char == u')':
+            elif char == ')':
                 if depth > 0:
                     depth -= 1
             else:
@@ -499,8 +499,8 @@ def _parse_parentheses(s):
     return groups
 
 
-FORBIDDEN_CHAR = [u":"]
-RESERVED_CHAR = [u"|", u"&"]
+FORBIDDEN_CHAR = [":"]
+RESERVED_CHAR = ["|", "&"]
 RE_FACET = re.compile('([-a-zA-Z]+)="([^"]+)"(?:;"([^"]+)")*')
 
 
@@ -557,7 +557,7 @@ def _parse_query_string(string, query_parameters, current_dct, exc_dct,
                         if query_parameters[base_term].extra_query:
                             dct.update(query_parameters[base_term].extra_query)
                         if term in dct:
-                            dct[term] += u";" + query
+                            dct[term] += ";" + query
                         else:
                             dct[term] = query
                         if query_parameters[base_term].distinct_query:
@@ -569,10 +569,10 @@ def _parse_query_string(string, query_parameters, current_dct, exc_dct,
                                 ~Q(**dct) if excluded else Q(**dct)
                 return ""
     for reserved_char in FORBIDDEN_CHAR:
-        string = string.replace(reserved_char, u"")
+        string = string.replace(reserved_char, "")
     if len(string) != 1:
         for reserved_char in RESERVED_CHAR:
-            string = string.replace(reserved_char, u"")
+            string = string.replace(reserved_char, "")
     if not string:
         return ""
     if string.endswith('*'):
@@ -609,20 +609,20 @@ def _parse_parentheses_groups(groups, query_parameters, current_dct=None,
         extra_distinct_q = []
     if type(groups) is not list:
         string = groups.strip()
-        if string.startswith(u'"') and string.endswith(u'"') and \
-                string.count(u'"') == 2:
+        if string.startswith('"') and string.endswith('"') and \
+                string.count('"') == 2:
             string = string[1:-1]
         # split into many groups if spaces
 
         # do not split inside quotes
         current_index = 0
         found = string.find('"', current_index)
-        SEP = u"?ç;?"  # replace spaces inside quote with this characters
+        SEP = "?ç;?"  # replace spaces inside quote with this characters
         previous_quote = None
         while found != -1:
             if previous_quote is not None:
                 string = string[0:previous_quote] + \
-                         string[previous_quote:found].replace(u' ', SEP) + \
+                         string[previous_quote:found].replace(' ', SEP) + \
                          string[found:]
                 previous_quote = None
                 # SEP is larger than a space
@@ -632,7 +632,7 @@ def _parse_parentheses_groups(groups, query_parameters, current_dct=None,
             current_index = found + 1
             found = string.find('"', current_index)
 
-        string_groups = [gp.replace(SEP, u" ") for gp in string.split(u" ")]
+        string_groups = [gp.replace(SEP, " ") for gp in string.split(" ")]
         if len(string_groups) == 1:
             return _parse_query_string(
                 string_groups[0], query_parameters, current_dct, exc_dct,
@@ -661,9 +661,9 @@ def _parse_parentheses_groups(groups, query_parameters, current_dct=None,
         query += q
         has_item = True
         previous_sep = None
-    query += u")"
-    if query == u"()":
-        query = u""
+    query += ")"
+    if query == "()":
+        query = ""
     query = unidecode(query)
     return query, current_dct, exc_dct, extra_distinct_q
 
@@ -1071,8 +1071,8 @@ def _construct_query(relation_types, dct, or_reqs, and_reqs):
 
     # manage multi value not already managed
     for key in list(dct.keys()):
-        if type(dct[key]) == str and u";" in dct[key]:
-            values = [v for v in dct[key].split(u';') if v]
+        if type(dct[key]) == str and ";" in dct[key]:
+            values = [v for v in dct[key].split(';') if v]
             if not values:
                 dct.pop(key)
                 continue
@@ -1134,7 +1134,7 @@ def _manage_default_search(dct, request, model, default_name, my_base_request,
         else:
             try:
                 dct = {"pk": request.session[default_name]}
-                pinned_search = u'"{}"'.format(
+                pinned_search = '"{}"'.format(
                     model.objects.get(pk=dct["pk"])
                 )
             except model.DoesNotExist:
@@ -1163,7 +1163,7 @@ def _manage_default_search(dct, request, model, default_name, my_base_request,
                         else:
                             req_key, up_attr = model.UP_MODEL_QUERY[
                                 up_item.SLUG]
-                            pinned_search = u'{}="{}"'.format(
+                            pinned_search = '{}="{}"'.format(
                                 req_key,
                                 getattr(up_item, up_attr)
                             )
@@ -1175,12 +1175,12 @@ def _manage_default_search(dct, request, model, default_name, my_base_request,
 
 def _format_val(val):
     if val is None:
-        return u""
+        return ""
     if type(val) == bool:
         if val:
-            return str(_(u"True"))
+            return str(_("True"))
         else:
-            return str(_(u"False"))
+            return str(_("False"))
     return str(val)
 
 
@@ -1209,8 +1209,8 @@ def _format_geojson(rows, link_template):
             'type': 'Feature',
             'properties': feat,
             'geometry': {
-                u'type': u'Point',
-                u'coordinates': [x, y]
+                'type': 'Point',
+                'coordinates': [x, y]
             }
         }
         data['features'].append(feature)
@@ -1320,14 +1320,14 @@ def _get_data_from_query_old(items, query_table_cols, request,
                     new_vals = []
                     if not vals:
                         for idx, my_v in enumerate(my_vals):
-                            new_vals.append(u"{}{}{}".format(
-                                my_v, u' - ', ''))
+                            new_vals.append("{}{}{}".format(
+                                my_v, ' - ', ''))
                     else:
                         for idx, v in enumerate(vals):
-                            new_vals.append(u"{}{}{}".format(
-                                vals[idx], u' - ', _format_val(v)))
+                            new_vals.append("{}{}{}".format(
+                                vals[idx], ' - ', _format_val(v)))
                     my_vals = new_vals[:]
-            data.append(u" & ".join(my_vals) or u"")
+            data.append(" & ".join(my_vals) or "")
         if has_lock:
             data.append(item.locked)
             data.append(item.lock_user_id)
@@ -1857,7 +1857,7 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
                 sorts[num] = ['', '']  # sign, col_num
             if k.endswith('[dir]'):
                 order = request_items[k]
-                sign = order and order == u'desc' and "-" or ''
+                sign = order and order == 'desc' and "-" or ''
                 sorts[num][0] = sign
             if k.endswith('[column]'):
                 sorts[num][1] = request_items[k]
@@ -2051,7 +2051,7 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
         elif data_type == "csv":
             response = HttpResponse(content_type='text/csv', charset=ENCODING)
             n = datetime.datetime.now()
-            filename = u'%s_%s.csv' % (
+            filename = '%s_%s.csv' % (
                 default_name, n.strftime('%Y%m%d-%H%M%S'))
             response['Content-Disposition'] = 'attachment; filename=%s' \
                                               % filename
@@ -2062,7 +2062,7 @@ def get_item(model, func_name, default_name, extra_request_keys=None,
                 col_names = []
                 for field_name in table_cols:
                     if type(field_name) in (list, tuple):
-                        field_name = u" & ".join(field_name)
+                        field_name = " & ".join(field_name)
                     if hasattr(model, 'COL_LABELS') and \
                             field_name in model.COL_LABELS:
                         field = model.COL_LABELS[field_name]