Conflicts:

	correios.py

correios_server.py

@@ -25,34 +25,31 @@ def _get_info_from_correios(cep):
 
 
 
-@route('/cep/<cep>')
+@route('/cep/<cep:re:\d{5}-?\d{3}>')
 def verifica_cep(cep):
 	cep = cep.replace('-','')
 	
 	try:
-		if re.match('[0-9]{8}', cep):
-			con = pymongo.MongoClient('localhost')
-			db = con.postmon
-			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})
+		con = pymongo.MongoClient('localhost')
+		db = con.postmon
+		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:
-			raise ValueError()
+			result = ceps.find_one({'cep':cep}, fields={'_id':False,'v_date':False})
 
 	except ValueError:
 		result = dict(status='404',
@@ -84,4 +81,3 @@ def error500(code):
 
 def _standalone(port=9876):
     run(host='localhost', port=port)
-