From e60176695dbfb0508e494b3b0853e7a0adc7d000 Mon Sep 17 00:00:00 2001
From: Jack Stdin <hellotan@live.ru>
Date: Mon, 15 Feb 2016 12:48:32 +0300
Subject: [PATCH] Add url.unquote for input text

---
 aore/fias/fiasfactory.py | 2 ++
 aore/fias/wordentry.py   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/aore/fias/fiasfactory.py b/aore/fias/fiasfactory.py
index 8f7aef3..0563c8f 100644
--- a/aore/fias/fiasfactory.py
+++ b/aore/fias/fiasfactory.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import re
+import urllib
 from uuid import UUID
 
 import psycopg2
@@ -47,6 +48,7 @@ class FiasFactory:
 
     def find(self, text, strong=False):
         try:
+            text = urllib.unquote(text).decode('utf8')
             self.__check_param(text, "text")
             self.__check_param(strong, "boolean")
 
diff --git a/aore/fias/wordentry.py b/aore/fias/wordentry.py
index e76833c..3205bdd 100644
--- a/aore/fias/wordentry.py
+++ b/aore/fias/wordentry.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import re
 
-from aore.config import sphinx_conf
 from aore.config import basic
+from aore.config import sphinx_conf
 
 
 class WordEntry:
@@ -44,7 +44,7 @@ class WordEntry:
 
     def __init__(self, db, word):
         self.db = db
-        self.word = str(word).decode('utf8')
+        self.word = str(word)
         self.word_len = len(unicode(self.word))
         self.variations = []
         self.scname = None