change imports

Author: MarkusHackspacher

farmlib/__init__.py

@@ -4,7 +4,6 @@
 import pygame
 
 from .dictmapper import DictMapper
-from .pluginsystem import base_plugin_system as PluginSystem
 
 # SETTINGS
 

farmlib/expbar.py

@@ -5,7 +5,7 @@
 '''
 import pygame
 
-from pygameui import Label
+from pygameui.label import Label
 
 
 class ExpBar(Label):

farmlib/gamewindow.py

@@ -11,7 +11,7 @@
 import pygame
 
 import farmlib
-from farmlib import __VERSION__, PluginSystem
+from farmlib import __VERSION__
 from farmlib.coreplugin import CorePlugin
 from farmlib.expbar import ExpBar
 from farmlib.farm import objects
@@ -24,7 +24,11 @@
                                      render_field, render_rain,
                                      render_seed_notify)
 from farmlib.timer import Timer
-from pygameui import Button, Image, Label, Window
+from farmlib.pluginsystem import base_plugin_system as PluginSystem
+from pygameui.button import Button
+from pygameui.image import Image
+from pygameui.label import Label
+from pygameui.window import Window
 
 log = logging.getLogger("farmlib/gamewindow")
 
@@ -40,7 +44,8 @@
 # merge objects images data (objects image have objects/objects+id.png)
 for gobject in objects:
     name = "object" + str(gobject['id']) + ".png"
-    objectsimagepath = os.path.join("data", "images", os.path.join("objects", name))
+    objectsimagepath = os.path.join("data", "images",
+                                    os.path.join("objects", name))
     imagesdata["object" + str(gobject['id'])] = objectsimagepath
 
 

farmlib/helpwindow.py

@@ -5,7 +5,8 @@
 '''
 import os
 
-from pygameui import Label, Window
+from pygameui.label import Label
+from pygameui.window import Window
 
 
 class HelpWindow(Window):

farmlib/inventorywindow.py

@@ -5,7 +5,10 @@
 
 from .farm import objects
 from .tooltip import Tooltip
-from pygameui import Button, Container, Image, Label
+from pygameui.button import Button
+from pygameui.container import Container
+from pygameui.image import Image
+from pygameui.label import Label
 
 
 class InventoryWindow(Container):

farmlib/main.py

@@ -12,7 +12,6 @@
 pygame.key.set_repeat(400, 100)
 
 
-
 class FarmGamePygame(object):
     """
     Farm Game Pygame
@@ -125,4 +124,3 @@ def main(self):
     f = FarmGamePygame()
     f.set_active_screen(MenuWindow())
     f.run()
-

farmlib/marketwindow.py

@@ -8,7 +8,10 @@
 import farmlib
 from .farm import objects
 from .tooltip import Tooltip
-from pygameui import Button, Container, Image, Label
+from pygameui.button import Button
+from pygameui.container import Container
+from pygameui.image import Image
+from pygameui.label import Label
 
 WATERREFILLCOST = farmlib.rules["WATERREFILLCOST"]
 OBJECTSNOTINMARKET = farmlib.rules["OBJECTSNOTINMARKET"]

farmlib/menuwindow.py

@@ -8,7 +8,10 @@
 import pygame
 
 from farmlib.gamewindow import GameWindow
-from pygameui import Button, Container, Image, Label
+from pygameui.button import Button
+from pygameui.container import Container
+from pygameui.image import Image
+from pygameui.label import Label
 
 
 class MenuWindow(Container):

farmlib/tooltip.py

@@ -3,7 +3,8 @@
 
 @author: orneo1212
 '''
-from pygameui import Label, Window
+from pygameui.label import Label
+from pygameui.window import Window
 
 
 class Tooltip(Window):

pyFarmGame.py

@@ -5,8 +5,9 @@
 
 import pygame
 
-from farmlib import __VERSION__, PluginSystem
+from farmlib import __VERSION__
 from farmlib.menuwindow import MenuWindow
+from farmlib.pluginsystem import base_plugin_system as PluginSystem
 
 pygame.init()
 pygame.key.set_repeat(100, 100)
@@ -124,4 +125,3 @@ def main(self):
     f = FarmGamePygame()
     f.set_active_screen(MenuWindow())
     f.run()
-