Merge pull request #442 from fchapoton/patch-18

taking care of basestring for py3

Author: dimpase

sagenb/notebook/notebook.py

@@ -35,6 +35,11 @@
 except ImportError:
     import pickle
 
+try:
+    basestring
+except NameError:
+    basestring = (str, bytes)
+    
 from six import iteritems
 
 # Sage libraries

sagenb/notebook/run_notebook.py

@@ -23,6 +23,11 @@
 
 from six import iteritems
 
+try:
+    basestring
+except NameError:
+    basestring = (str, bytes)
+
 from sagenb.misc.misc import (DOT_SAGENB, find_next_available_port,
                               print_open_msg)
 

sagenb/notebook/smtpsend.py

@@ -20,9 +20,9 @@
 
 from twisted.mail import smtp, relaymanager
 from twisted.internet import reactor, defer
-from email.MIMEBase import MIMEBase
-from email.MIMEMultipart import MIMEMultipart
-from email import Encoders
+from email.mime.base import MIMEBase
+from email.mime.multipart import MIMEMultipart
+from email import encoders
 import sys
 import mimetypes
 import os

sagenb/notebook/user_manager.py

@@ -3,6 +3,11 @@
 import crypt
 import hashlib
 
+try:
+    unicode
+except NameError:
+    unicode = str
+
 SALT = 'aa'
 
 class UserManager(object):
@@ -54,7 +59,7 @@ def user_list(self):
             sage: U.user_list()
             [_sage_, admin, guest, pub]
         """
-        user_list = list(self.users().itervalues())
+        user_list = list(self.users().values())
         user_list.sort(key=lambda x: str(x))
         return user_list
 

sagenb/storage/filesystem_storage.py

@@ -308,7 +308,7 @@ def load_users(self, user_manager):
             sage: U.users()
             {'admin': admin, 'wstein': wstein}
         """
-        for user in self._basic_to_users(self._load('users.pickle')).itervalues():
+        for user in self._basic_to_users(self._load('users.pickle')).values():
             user_manager.add_user_object(user, force=True) 
             user_manager.set_password(user.username(), user.password(), encrypt = False)
         return user_manager