Initial port of core code to Python3.

[automanga.git] / manga / lib.py

diff --git a/manga/lib.py b/manga/lib.py
index 70b3ff9..c0a9f30 100644 (file)
--- a/manga/lib.py
+++ b/manga/lib.py
@@ -149,7 +149,7 @@ class imgstream(object):
         """Close this stream."""
         raise NotImplementedError()
 
         """Close this stream."""
         raise NotImplementedError()
 

-    def read(self, sz = None):
+    def read(self, sz=None):

         """Read SZ bytes from the stream, or the entire rest of the
         stream of SZ is not given."""
         raise NotImplementedError()
         """Read SZ bytes from the stream, or the entire rest of the
         stream of SZ is not given."""
         raise NotImplementedError()


@@ -159,8 +159,8 @@ class stdimgstream(imgstream):
     have no particular implementation requirements."""
 
     def __init__(self, url):
     have no particular implementation requirements."""
 
     def __init__(self, url):

-        import urllib
-        self.bk = urllib.urlopen(url)
+        import urllib.request
+        self.bk = urllib.request.urlopen(url)

         ok = False
         try:
             if self.bk.getcode() != 200:
         ok = False
         try:
             if self.bk.getcode() != 200:


@@ -178,7 +178,7 @@ class stdimgstream(imgstream):
     def close(self):
         self.bk.close()
 
     def close(self):
         self.bk.close()
 

-    def read(self, sz = None):
+    def read(self, sz=None):

         if sz is None:
             return self.bk.read()
         else:
         if sz is None:
             return self.bk.read()
         else:


@@ -218,7 +218,8 @@ class cursor(object):
 loaded = {}
 def findlib(name):
     def load(name):
 loaded = {}
 def findlib(name):
     def load(name):

-        mod = __import__(name, fromlist=["dummy"])
+        import importlib
+        mod = importlib.import_module(name)

         if not hasattr(mod, "library"):
             raise ImportError("module " + name + " is not a manga library")
         return mod.library()
         if not hasattr(mod, "library"):
             raise ImportError("module " + name + " is not a manga library")
         return mod.library()