Merge branch 'pdf' of github.com:tshirtman/kivy into pdf

Conflicts:
	kivy/core/image/img_pdf.py

Author: tshirtman

kivy/__init__.py

@@ -175,6 +175,7 @@ def kivy_usage():
 
 
 # Start !
+Logger.setLevel(level=LOG_LEVELS.get('info'))
 Logger.info('Kivy v%s' % (__version__))
 
 #: Global settings options for kivy

kivy/core/image/img_pdf.py

@@ -33,31 +33,31 @@ def load(self, filename):
             print "load pdf!", self.page
             # first extract the page from the pdf
             pdf = PdfFileReader(open(filename, 'rb'))
-            try:
-                p2 = pdf.getPage(self.page)
-            except IndexError:
-                self.page = 0
-                p2 = pdf.getPage(self.page)
+            p = pdf.getPage(self.page)
+            size = p.mediaBox[2:]
+            print p.trimBox, p.mediaBox, p.cropBox, p.bleedBox, p.artBox
 
-            size = p2.cropBox[2:]
             w = PdfFileWriter()
-            w.addPage(p2)
+            w.addPage(p)
             f = io.BytesIO()
             w.write(f)
             f.seek(0)
 
             # then convert the one page pdf filebuffer to an image
             blob = pm.Blob(f.read())
             blobrgb = pm.Blob()
-            pm.Image(blob).write(blobrgb,'rgba')
+            pm.Image(blob).write(blobrgb,'rgb')
             #blobpng.data
 
-            im = PILImage.frombuffer('RGBA', size, blobrgb.data, 'raw', 'RGBA', 0 ,0)
+            im = PILImage.frombuffer(
+                    'RGB',
+                    (size[0] * 2, size[1]),
+                    blobrgb.data).resize(size)
 
         except:
             Logger.warning('Image: Unable to load image <%s>' % filename)
             raise
 
-        return (ImageData(size[0], size[1], 'rgba', im.tostring()),)
+        return (ImageData(size[0], size[1], 'rgb', im.tostring()),)
 
 ImageLoader.register(ImageLoaderPDF)

kivy/lib/debug.py

@@ -308,5 +308,8 @@ def tb_set_next(tb, next):
 # proxies.
 tb_set_next = None
 if tproxy is None:
-    tb_set_next = _init_ugly_crap()
+    try:
+        tb_set_next = _init_ugly_crap()
+    except ImportError:
+        tb_set_next = None
     del _init_ugly_crap

kivy/logger.py

@@ -252,33 +252,6 @@ def filter(self, record):
         return True
 
 
-class ColoredLogger(logging.Logger):
-
-    use_color = True
-    if os.name == 'nt':
-        use_color = False
-
-    FORMAT = '[%(levelname)-18s] %(message)s'
-    COLOR_FORMAT = formatter_message(FORMAT, use_color)
-
-    def __init__(self, name):
-        logging.Logger.__init__(self, name, logging.DEBUG)
-        color_formatter = ColoredFormatter(self.COLOR_FORMAT,
-                                           use_color=self.use_color)
-        console = ConsoleHandler()
-        console.setFormatter(color_formatter)
-
-        self.addHandler(LoggerHistory())
-        self.addHandler(FileHandler())
-
-        # Use the custom handler instead of streaming one.
-        if hasattr(sys, '_kivy_logging_handler'):
-            self.addHandler(getattr(sys, '_kivy_logging_handler'))
-        else:
-            self.addHandler(console)
-        return
-
-
 class LogFile(object):
 
     def __init__(self, channel, func):
@@ -299,14 +272,26 @@ def write(self, s):
     def flush(self):
         return
 
-if 'nosetests' not in sys.argv:
-    logging.setLoggerClass(ColoredLogger)
-
 #: Kivy default logger instance
-Logger = logging.getLogger('Kivy')
+Logger = logging.getLogger('kivy')
 Logger.logfile_activated = False
 Logger.trace = partial(Logger.log, logging.TRACE)
 
+# add default kivy logger
+Logger.addHandler(LoggerHistory())
+Logger.addHandler(FileHandler())
+
+# Use the custom handler instead of streaming one.
+if hasattr(sys, '_kivy_logging_handler'):
+    Logger.addHandler(getattr(sys, '_kivy_logging_handler'))
+else:
+    use_color = os.name != 'nt'
+    color_fmt = formatter_message('[%(levelname)-18s] %(message)s', use_color)
+    formatter = ColoredFormatter(color_fmt, use_color=use_color)
+    console = ConsoleHandler()
+    console.setFormatter(formatter)
+    Logger.addHandler(console)
+
 # install stderr handlers
 sys.stderr = LogFile('stderr', Logger.warning)