[Fix] py2 & 3

NEMbox/__init__.py

@@ -3,6 +3,13 @@
 '''
 网易云音乐 Entry
 '''
+from __future__ import print_function
+from __future__ import unicode_literals
+from __future__ import division
+from __future__ import absolute_import
+from builtins import str
+from future import standard_library
+standard_library.install_aliases()
 
 import curses
 import traceback

NEMbox/api.py

@@ -5,6 +5,18 @@
 '''
 网易云音乐 Api
 '''
+from __future__ import print_function
+from __future__ import unicode_literals
+from __future__ import division
+from __future__ import absolute_import
+from builtins import chr
+from builtins import int
+from builtins import map
+from builtins import open
+from builtins import range
+from builtins import str
+from future import standard_library
+standard_library.install_aliases()
 
 import re
 import os
@@ -16,10 +28,7 @@
 import binascii
 
 from Crypto.Cipher import AES
-try:
-    from http.cookiejar import LWPCookieJar
-except ImportError:
-    from cookielib import LWPCookieJar
+from http.cookiejar import LWPCookieJar
 from bs4 import BeautifulSoup
 import requests
 

NEMbox/cache.py

@@ -4,6 +4,13 @@
 '''
 Class to cache songs into local storage.
 '''
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from builtins import str
+from future import standard_library
+standard_library.install_aliases()
 
 import threading
 import subprocess

NEMbox/config.py

@@ -1,5 +1,12 @@
 # encoding: UTF-8
 
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from builtins import open
+from future import standard_library
+standard_library.install_aliases()
 import json
 import os
 

NEMbox/const.py

@@ -1,5 +1,11 @@
 # encoding: UTF-8
 
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 import os
 
 

NEMbox/logger.py

@@ -3,6 +3,13 @@
 # @Author: omi
 # @Date:   2014-08-24 21:51:57
 
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from builtins import open
+from future import standard_library
+standard_library.install_aliases()
 import os
 import logging
 

NEMbox/menu.py

@@ -5,6 +5,14 @@
 '''
 网易云音乐 Menu
 '''
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from builtins import range
+from builtins import str
+from future import standard_library
+standard_library.install_aliases()
 
 import curses
 import locale
@@ -15,6 +23,8 @@
 import time
 import signal
 import webbrowser
+import xml.etree.cElementTree as ET
+
 
 from .api import NetEase
 from .player import Player
@@ -26,10 +36,7 @@
 from .storage import Storage
 from .cache import Cache
 from . import logger
-try:
-    import xml.etree.cElementTree as ET
-except ImportError:
-    import xml.etree.ElementTree as ET
+
 
 log = logger.getLogger(__name__)
 

NEMbox/osdlyrics.py

@@ -3,6 +3,13 @@
 # osdlyrics.py --- desktop lyrics for musicbox
 # Copyright (c) 2015-2016 omi & Contributors
 
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from builtins import super
+from future import standard_library
+standard_library.install_aliases()
 import sys
 from multiprocessing import Process
 

NEMbox/player.py

@@ -7,6 +7,14 @@
 '''
 网易云音乐 Player
 '''
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from builtins import range
+from builtins import str
+from future import standard_library
+standard_library.install_aliases()
 # Let's make some noise
 
 import subprocess

NEMbox/scrollstring.py

@@ -1,6 +1,14 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
+from __future__ import division
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import absolute_import
+from builtins import int
+from builtins import chr
+from future import standard_library
+standard_library.install_aliases()
 from time import time
 import locale
 

NEMbox/singleton.py

@@ -1,3 +1,10 @@
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from builtins import super
+from future import standard_library
+standard_library.install_aliases()
 class Singleton(object):
     """Singleton Class
     This is a class to make some class being a Singleton class.

NEMbox/storage.py

@@ -4,6 +4,13 @@
 '''
 Class to stores everything into a json file.
 '''
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from builtins import open
+from future import standard_library
+standard_library.install_aliases()
 import json
 
 from .const import Constant

NEMbox/terminalsize.py

@@ -1,4 +1,11 @@
 #!/usr/bin/env python
+from __future__ import print_function
+from __future__ import unicode_literals
+from __future__ import division
+from __future__ import absolute_import
+from builtins import int
+from future import standard_library
+standard_library.install_aliases()
 import os
 import shlex
 import struct

NEMbox/ui.py

@@ -5,12 +5,21 @@
 '''
 网易云音乐 Ui
 '''
+from __future__ import division
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import absolute_import
+from builtins import range
+from builtins import str
+from builtins import int
+from future import standard_library
+standard_library.install_aliases()
 import hashlib
 import re
 import curses
 
 from .api import NetEase
-from .scrollstring import *
+from .scrollstring import truelen, scrollstring
 from .storage import Storage
 from .config import Config
 from .utils import notify
@@ -34,6 +43,7 @@ def escape_quote(text):
 
 
 class Ui(object):
+
     def __init__(self):
         self.screen = curses.initscr()
         self.screen.timeout(100)  # the screen refresh every 100ms
@@ -266,8 +276,8 @@ def build_menu(self, datatype, title, datalist, offset, index, step,
                     if i == index:
                         self.screen.addstr(
                             i - offset + 9, self.indented_startcol,
-                            '-> ' + str(i) + '. ' + datalist[i]['artists_name']
-                            + self.space + str(datalist[i]['alias']),
+                            '-> ' + str(i) + '. ' + datalist[i]['artists_name'] +
+                            self.space + str(datalist[i]['alias']),
                             curses.color_pair(2))
                     else:
                         self.screen.addstr(
@@ -281,9 +291,8 @@ def build_menu(self, datatype, title, datalist, offset, index, step,
                     if i == index:
                         self.screen.addstr(
                             i - offset + 9, self.indented_startcol,
-                            '-> ' + str(i) + '. ' + datalist[i]['albums_name']
-                            + self.space + datalist[i][
-                                'artists_name'], curses.color_pair(2))
+                            '-> ' + str(i) + '. ' + datalist[i]['albums_name'] +
+                            self.space + datalist[i]['artists_name'], curses.color_pair(2))
                     else:
                         self.screen.addstr(
                             i - offset + 9, self.startcol,
@@ -414,7 +423,7 @@ def build_search(self, stype):
                         else:
                             for i in range(0, len(data['result']['songs'])):
                                 song_ids.append(data['result']['songs'][i][
-                                                    'id'])
+                                    'id'])
                             songs = netease.songs_detail(song_ids)
                         return netease.dig_info(songs, 'songs')
                 except Exception as e:

NEMbox/utils.py

@@ -3,6 +3,13 @@
 # utils.py --- utils for musicbox
 # Copyright (c) 2015-2016 omi & Contributors
 
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from builtins import str
+from future import standard_library
+standard_library.install_aliases()
 import platform
 import os
 

setup.py

@@ -33,6 +33,12 @@
 + ------------------------------------------ +
 
 '''
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
 
 from setuptools import setup, find_packages