From db95ea183fd1502e411ad7b7a4311da3e5b6e314 Mon Sep 17 00:00:00 2001 From: mulhergorila Date: Thu, 11 May 2017 12:16:09 -0300 Subject: [PATCH 1/6] =?UTF-8?q?Exerc=C3=ADcio=20Resolvido?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exercicios/buscador.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/exercicios/buscador.py b/exercicios/buscador.py index fa31149..55b334e 100644 --- a/exercicios/buscador.py +++ b/exercicios/buscador.py @@ -1,7 +1,11 @@ +import sys +import unicodedata + + def buscar(*palavras_chave): """ Busca por caracteres que contenham a palavra chave em seu nome. Ex: - + >>> from exercicios.buscador import buscar >>> for caracter, nome in sorted(buscar('BLACK', 'suit')): ... print(caracter, nome) @@ -29,9 +33,24 @@ def buscar(*palavras_chave): ... ♔ WHITE CHESS KING ♚ BLACK CHESS KING - + :param palavras_chave: tupla de strings :return: generator onde cada elemento é uma tupla. O primeiro elemento da tupla é o caracter e o segundo é seu nome. Assim ele pode ser utilizado no construtor de um dicionário """ + limite = 0 + max_unicode_value = sys.maxunicode + palavras_upper = [palavra.upper() for palavra in palavras_chave] + while limite < max_unicode_value: + caracter = chr(limite) + try: + unicode_name_upper = unicodedata.name(caracter).upper().split() + except ValueError: + pass + else: + if all(palavra in unicode_name_upper for palavra in palavras_upper): + yield (caracter, " ".join(unicode_name_upper)) + finally: + limite += 1 + return From 8ca7fdd3d218d5539a4f4099d0a8291c8c6921db Mon Sep 17 00:00:00 2001 From: mulhergorila Date: Thu, 11 May 2017 12:32:21 -0300 Subject: [PATCH 2/6] =?UTF-8?q?Removido=20return=20da=20fun=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exercicios/buscador.py | 1 - 1 file changed, 1 deletion(-) diff --git a/exercicios/buscador.py b/exercicios/buscador.py index 55b334e..e896c62 100644 --- a/exercicios/buscador.py +++ b/exercicios/buscador.py @@ -53,4 +53,3 @@ def buscar(*palavras_chave): yield (caracter, " ".join(unicode_name_upper)) finally: limite += 1 - return From 90a9dd9ac3c39b09acc6c38d079b5a9a22e7b014 Mon Sep 17 00:00:00 2001 From: mulhergorila Date: Sat, 27 May 2017 14:08:55 -0300 Subject: [PATCH 3/6] Atualizando requests==2.16.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7369cb8..0abc604 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -requests==2.14.2 +requests==2.16.3 From 887641c8c1bc9c91273f86742cbff149e8d03c8e Mon Sep 17 00:00:00 2001 From: mulhergorila Date: Sat, 27 May 2017 15:45:10 -0300 Subject: [PATCH 4/6] PEP 8 --- exercicios/buscador.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/exercicios/buscador.py b/exercicios/buscador.py index 2048baa..e5a784b 100644 --- a/exercicios/buscador.py +++ b/exercicios/buscador.py @@ -49,7 +49,10 @@ def buscar(*palavras_chave): except ValueError: pass else: - if all(palavra in unicode_name_upper for palavra in palavras_upper): + if all( + palavra in unicode_name_upper + for palavra in palavras_upper + ): yield (caracter, " ".join(unicode_name_upper)) finally: limite += 1 From b96e7804553cb5a5aa7f48d3962ed5f775d8f056 Mon Sep 17 00:00:00 2001 From: mulhergorila Date: Mon, 29 May 2017 12:38:46 -0300 Subject: [PATCH 5/6] Atualizando requests em requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0abc604..c5f8746 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -requests==2.16.3 +requests==2.16.5 From 72c80de203f6880a67f6a7c54040878e8f826d8b Mon Sep 17 00:00:00 2001 From: renzon Date: Tue, 30 May 2017 21:22:08 -0300 Subject: [PATCH 6/6] pulando linha no req --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 7369cb8..45931b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ requests==2.14.2 +