Removendo codigo duplicado

correios.py

@@ -4,6 +4,9 @@ import requests
 import unicodedata
 import re
 
+def _normalize_unicode(text):
+	return unicodedata.normalize('NFKD', text).encode('ascii','ignore') if isinstance(text, unicode) else text
+
 class CepTracker():
 	def __init__(self):
 		self.url = 'http://m.correios.com.br/movel/buscaCepConfirma.do'
@@ -38,9 +41,9 @@ class CepTracker():
 
 			if (index == 2):
 				for j, text in enumerate(text.split('/')):
-					data[self.fields[index][j]] = unicodedata.normalize('NFKD', text.strip()).encode('ascii','ignore') if isinstance(text, unicode) else text.strip()
+					data[self.fields[index][j]] = _normalize_unicode(text.strip())
 			else:
-				data[self.fields[index]] = unicodedata.normalize('NFKD', text).encode('ascii','ignore') if isinstance(text, unicode) else text
+				data[self.fields[index]] = _normalize_unicode(text)
 				
 			index +=1
 

correios_server.py

@@ -35,21 +35,15 @@ def verifica_cep(cep):
 		ceps = db.ceps
 		result = ceps.find_one({'cep':cep}, fields={'_id':False})
 
-		from datetime import date
-
-		info = None
-		
 		if not result or not result.has_key('v_date'):
 			info = _get_info_from_correios(cep)
 			map(lambda x: ceps.save(x), info)
-			result = ceps.find_one({'cep':cep}, fields={'_id':False, 'v_date':False})
 
 		elif expired(result):
 			info = _get_info_from_correios(cep)
 			map(lambda x: ceps.update({'cep': x['cep']}, {'$set':x}), info)
-			result = ceps.find_one({'cep':cep}, fields={'_id':False,'v_date':False})
-		else:
-			result = ceps.find_one({'cep':cep}, fields={'_id':False,'v_date':False})
+
+		result = ceps.find_one({'cep':cep}, fields={'_id':False,'v_date':False})
 
 	except ValueError:
 		result = dict(status='404',