Python3 support ✨ 🐍 ✨

Author: bcongdon

.gitignore

@@ -62,3 +62,4 @@ target/
 .ipynb_checkpoints
 venv
 .env
+venv3

.travis.yml

@@ -2,6 +2,8 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - "3.5"
+  - "3.6"
 install: 
   - "pip install -r requirements.txt"
-script: nosetests
+script: nosetests

emojipedia/__init__.py

@@ -1 +1 @@
-from emojipedia import Emojipedia
+from .emojipedia import Emojipedia

emojipedia/emoji.py

@@ -85,7 +85,7 @@ def __str__(self):
         string = string.format(self.title,
                                self.description[:20] + "...",
                                self.character)
-        return string.encode('utf-8')
+        return string
 
     def __repr__(self):
         return self.__str__()

emojipedia/emojipedia.py

@@ -1,7 +1,8 @@
 from __future__ import unicode_literals
 from bs4 import BeautifulSoup
 import requests
-from emoji import Emoji
+from codecs import decode
+from .emoji import Emoji
 
 
 class Emojipedia:
@@ -23,12 +24,12 @@ def valid_emoji_page(soup):
 
     @staticmethod
     def get_emoji_page(query):
-        response = requests.get('http://emojipedia.org/' + query.decode('utf-8', 'backslashreplace'))
+        response = requests.get('http://emojipedia.org/' + query)
         if response.status_code != 200:
             raise UserWarning('Could not get emojipedia page for \'{0}\''
                               .format(query))
 
-        soup = BeautifulSoup(response.text)
+        soup = BeautifulSoup(response.text, 'html.parser')
         if not Emojipedia.valid_emoji_page(soup):
             raise UserWarning('Query did not yield a emoji entry')
         return soup

requirements.txt

@@ -1,2 +1,7 @@
-beautifulsoup4==4.3.2
-requests==2.5.0
+appdirs==1.4.0
+beautifulsoup4==4.4.0
+nose==1.3.7
+packaging==16.8
+pyparsing==2.1.10
+requests==2.5.0
+six==1.10.0

test_emojipedia.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from emojipedia import Emojipedia
 import nose.tools
 
@@ -70,11 +72,12 @@ def test_emoji_title():
 
 def test_emoji_character():
     taco = Emojipedia.search('taco')
-    # Python Unicode silliness
-    assert taco.character.encode('unicode_escape') == '\\U0001f32e'
+    assert taco.character == u'🌮'
 
 
 def test_emoji_repr():
     pizza = Emojipedia.search('slice-of-pizza')
-    found = str(pizza).decode('utf-8').encode('ascii', 'backslashreplace')
-    assert found.startswith('<Emoji - ') and found.endswith('>')
+    correct = u"<Emoji - 'Pizza' - character: 🍕, description: A slice  of pizza, w...>"
+    print(type(correct))
+    print(type(pizza.__str__()))
+    assert pizza.__str__() == correct