diff --git a/kivy/core/image/img_imageio.pyx b/kivy/core/image/img_imageio.pyx index fe8970fdb..22a4c7985 100644 --- a/kivy/core/image/img_imageio.pyx +++ b/kivy/core/image/img_imageio.pyx @@ -15,7 +15,7 @@ Image loader implementation based on CoreGraphics OSX framework. __all__ = ('ImageLoaderImageIO', ) from kivy.logger import Logger -from . import ImageLoaderBase, ImageData, ImageLoader +from kivy.core.image import ImageLoaderBase, ImageData, ImageLoader from array import array from libcpp cimport bool diff --git a/kivy/core/text/text_sdlttf.pyx b/kivy/core/text/text_sdlttf.pyx index b4fbff46c..1bcf84ee3 100644 --- a/kivy/core/text/text_sdlttf.pyx +++ b/kivy/core/text/text_sdlttf.pyx @@ -11,7 +11,7 @@ TODO: __all__ = ('LabelSDLttf', ) -from . import LabelBase +from kivy.core.text import LabelBase from kivy.core.image import ImageData from kivy.resources import resource_paths from os.path import exists, join diff --git a/kivy/graphics/c_opengl_debug.pyx b/kivy/graphics/c_opengl_debug.pyx index 490d6e362..7ae617a21 100644 --- a/kivy/graphics/c_opengl_debug.pyx +++ b/kivy/graphics/c_opengl_debug.pyx @@ -1,7 +1,7 @@ # This file was automatically generated with kivy/tools/stub-gl-debug.py include "common.pxi" -cimport c_opengl as cgl +cimport kivy.graphics.c_opengl as cgl cdef void glActiveTexture (GLenum texture) with gil: diff --git a/kivy/graphics/compiler.pyx b/kivy/graphics/compiler.pyx index c53d7987f..4176abb2d 100644 --- a/kivy/graphics/compiler.pyx +++ b/kivy/graphics/compiler.pyx @@ -59,8 +59,8 @@ Note to any Kivy contributor / internal developer: include 'opcodes.pxi' -from instructions cimport Instruction, RenderContext, ContextInstruction -from context_instructions cimport BindTexture +from kivy.graphics.instructions cimport Instruction, RenderContext, ContextInstruction +from kivy.graphics.context_instructions cimport BindTexture cdef class GraphicsCompiler: cdef InstructionGroup compile(self, InstructionGroup group): diff --git a/kivy/graphics/context_instructions.pyx b/kivy/graphics/context_instructions.pyx index c8b626821..06f42f63d 100644 --- a/kivy/graphics/context_instructions.pyx +++ b/kivy/graphics/context_instructions.pyx @@ -21,8 +21,8 @@ __all__ = ('Color', 'BindTexture', 'PushMatrix', 'PopMatrix', 'Rotate', 'Scale', 'Translate', 'MatrixInstruction', 'gl_init_resources') -from instructions cimport * -from transformation cimport * +from kivy.graphics.instructions cimport * +from kivy.graphics.transformation cimport * from kivy.cache import Cache from kivy.resources import resource_find diff --git a/kivy/graphics/gl_instructions.pyx b/kivy/graphics/gl_instructions.pyx index 9d598ef83..800493dcc 100644 --- a/kivy/graphics/gl_instructions.pyx +++ b/kivy/graphics/gl_instructions.pyx @@ -23,10 +23,10 @@ __all__ = ('ClearColor', 'ClearBuffers') include "config.pxi" include "opcodes.pxi" -from c_opengl cimport * +from kivy.graphics.c_opengl cimport * IF USE_OPENGL_DEBUG == 1: from c_opengl_debug cimport * -from instructions cimport Instruction +from kivy.graphics.instructions cimport Instruction cdef class ClearColor(Instruction): diff --git a/kivy/graphics/opengl_utils.pyx b/kivy/graphics/opengl_utils.pyx index 2b825f9fa..1971ceab0 100644 --- a/kivy/graphics/opengl_utils.pyx +++ b/kivy/graphics/opengl_utils.pyx @@ -16,7 +16,7 @@ include "opengl_utils_def.pxi" cimport c_opengl from kivy.logger import Logger from kivy.utils import platform as core_platform -from opengl import _GL_GET_SIZE +from kivy.graphics.opengl import _GL_GET_SIZE cdef list _gl_extensions = [] diff --git a/kivy/graphics/stencil_instructions.pyx b/kivy/graphics/stencil_instructions.pyx index b4bbdafb4..4b1533e69 100644 --- a/kivy/graphics/stencil_instructions.pyx +++ b/kivy/graphics/stencil_instructions.pyx @@ -93,10 +93,10 @@ __all__ = ('StencilPush', 'StencilPop', 'StencilUse', 'StencilUnUse') include "config.pxi" include "opcodes.pxi" -from c_opengl cimport * +from kivy.graphics.c_opengl cimport * IF USE_OPENGL_DEBUG == 1: - from c_opengl_debug cimport * -from instructions cimport Instruction + from kivy.graphics.c_opengl_debug cimport * +from kivy.graphics.instructions cimport Instruction cdef int _stencil_level = 0 cdef int _stencil_in_push = 0 diff --git a/kivy/graphics/vbo.pyx b/kivy/graphics/vbo.pyx index 248c4940b..335d5f8ec 100644 --- a/kivy/graphics/vbo.pyx +++ b/kivy/graphics/vbo.pyx @@ -12,11 +12,11 @@ include "config.pxi" include "common.pxi" from os import environ -from buffer cimport Buffer -from c_opengl cimport * +from kivy.graphics.buffer cimport Buffer +from kivy.graphics.c_opengl cimport * IF USE_OPENGL_DEBUG == 1: - from c_opengl_debug cimport * -from vertex cimport * + from kivy.graphics.c_opengl_debug cimport * +from kivy.graphics.vertex cimport * from kivy.logger import Logger from kivy.graphics.context cimport Context, get_context