Imports fixes

Code/Python/Apps/Europython09/App/simplegame-2.py

@@ -24,7 +24,7 @@
 import Axon
 import pygame
 from Kamaelia.Chassis.Pipeline import Pipeline
-from Kamaelia.Util.Backplane import *
+from Kamaelia.Util.Backplane import Backplane, PublishTo, SubscribeTo
 
 from Kamaelia.Apps.Games4Kids.BasicSprite import BasicSprite
 from Kamaelia.Apps.Games4Kids.SpriteScheduler import SpriteScheduler

Code/Python/Apps/GSOCPaint/App/KamPaint.py

@@ -20,7 +20,6 @@
 # limitations under the License.
 # -------------------------------------------------------------------------
 
-from pygame.locals import *
 from Axon.experimental.Process import ProcessGraphline
 
 from Kamaelia.Chassis.Seq import Seq

Code/Python/Apps/Games4Kids/App/main.py

@@ -83,7 +83,7 @@ def main(self):
             yield 1
 
 
-from Kamaelia.Util.Backplane import *
+from Kamaelia.Util.Backplane import Backplane, PublishTo, SubscribeTo
 Backplane("PLAYERS").activate()
 
 Pipeline(

Code/Python/Apps/Kamaelia-ERModeller/App/Modeller.py

@@ -19,8 +19,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import sys
-from Kamaelia.Util.Backplane import *
-from Kamaelia.Util.Console import *
+from Kamaelia.Util.Backplane import Backplane, PublishTo, SubscribeTo
+from Kamaelia.Util.Console import ConsoleReader, ConsoleEchoer
 from Kamaelia.Chassis.Pipeline import Pipeline
 from Kamaelia.Visualisation.PhysicsGraph.TopologyViewer import TopologyViewer
 from Kamaelia.Visualisation.PhysicsGraph.lines_to_tokenlists import lines_to_tokenlists

Code/Python/Apps/Kamaelia-Grey/App/greylisting.py

@@ -27,7 +27,7 @@
 from Kamaelia.Internet.TimeOutCSA import NoActivityTimeout
 from Kamaelia.Internet.ConnectedSocketAdapter import ConnectedSocketAdapter
 
-from Kamaelia.Apps.Grey.Support import *
+from Kamaelia.Apps.Grey.Support import SlurpFile, openConfig, parseConfigFile
 
 from Kamaelia.Apps.Grey.MailHandler import MailHandler
 from Kamaelia.Apps.Grey.ConcreteMailHandler import ConcreteMailHandler

Code/Python/Apps/ScribbleNLink/App/ScribbleNLink.py

@@ -21,7 +21,7 @@
 import random
 import Axon
 
-from Kamaelia.Util.Backplane import *
+from Kamaelia.Util.Backplane import Backplane, PublishTo, SubscribeTo
 from Kamaelia.Chassis.Pipeline import Pipeline
 from Kamaelia.Chassis.Graphline import Graphline
 

Code/Python/Apps/SocialBookmarks/App/web/bookmarks/api/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+#FIXME: --removed from recent django from django.conf.urls.defaults im port *
 from piston.resource import Resource
 from bookmarks.api.handlers import ProgrammesHandler, SummaryHandler, TimestampHandler, TweetHandler
 

Code/Python/Apps/SocialBookmarks/App/web/bookmarks/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+#FIXME: --removed from recent django from django.conf.urls.defaults im port *
 
 # Uncomment the next two lines to enable the admin:
 #from django.contrib import admin

Code/Python/Apps/SpeakNWrite/App/SpeakNWrite.py

@@ -25,7 +25,7 @@
 from Kamaelia.Chassis.Pipeline import Pipeline
 from Kamaelia.Chassis.Graphline import Graphline
 
-from Kamaelia.Util.Backplane import *
+from Kamaelia.Util.Backplane import Backplane, PublishTo, SubscribeTo
 from Kamaelia.Util.Console import ConsoleEchoer
 
 from Kamaelia.UI.Pygame.Display import PygameDisplay

Code/Python/Axon/Axon/Component.py

@@ -380,7 +380,7 @@ def closeDownComponent(self):
 from Axon.Scheduler import scheduler
 from Axon.AxonExceptions import noSpaceInBox
 from Axon.Linkage import linkage
-from Axon.Ipc import *
+from Axon.Ipc import ipc, WaitComplete, reactivate, newComponent, shutdownMicroprocess, notify, shutdown, status, wouldblock, producerFinished, errorInformation
 
 
 from Axon.Box import makeInbox,makeOutbox

Code/Python/Axon/Axon/Scheduler.py

@@ -276,7 +276,8 @@ def waitOneSecond(self):
 from Axon.debug import debug
 from Axon.Microprocess import microprocess
 from Axon.Base import AxonObject as _AxonObject
-from Axon.Ipc import *
+from Axon.Ipc import ipc, WaitComplete, reactivate, newComponent, shutdownMicroprocess, notify, shutdown, status, wouldblock, producerFinished, errorInformation
+
 try:
     import Queue as queue
     vrange = xrange

Code/Python/Axon/Examples/Simple/README.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from Axon.Component import *
+from Axon.Component import component, newComponent, scheduler
 
 class Producer(component):
    Inboxes=[]

Code/Python/Axon/Examples/Simple/all.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from Axon.Component import *
+from Axon.Component import component, newComponent, scheduler
 
 class Consumer(component):
     Inboxes = ["source"]

Code/Python/Axon/README

@@ -47,7 +47,7 @@ the running system)
 
 Example code:
 
-from Axon.Component import *
+from Axon.Component import component, newComponent, scheduler
 
 class Producer(component):
    Inboxes=[]

Code/Python/Kamaelia/Examples/Backplane/Forwarding.py

@@ -21,8 +21,8 @@
 
 import time
 import Axon
-from Kamaelia.Util.Backplane import *
-from Kamaelia.Util.Console import *
+from Kamaelia.Util.Backplane import Backplane, PublishTo, SubscribeTo
+from Kamaelia.Util.Console import ConsoleReader, ConsoleEchoer
 from Kamaelia.Chassis.Pipeline import Pipeline
 
 class Source(Axon.ThreadedComponent.threadedcomponent):

Code/Python/Kamaelia/Examples/Files/SimpleReading.py

@@ -19,7 +19,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from Kamaelia.Util.Console import *
+from Kamaelia.Util.Console import ConsoleReader, ConsoleEchoer
 from Kamaelia.Chassis.Pipeline import Pipeline
 from Kamaelia.File.Reading import SimpleReader
 from Kamaelia.Util.RateFilter import MessageRateLimit

Code/Python/Kamaelia/Examples/GraphVisualisation/BasicGraphVisualisation/ParticleDragger.py

@@ -22,10 +22,6 @@
 
 import UI
 
-# from pygame.locals import *
-
-
-
 class ParticleDragger(UI.MH.DragHandler):
      def detect(self, pos, button):
          inRange = self.app.physics.withinRadius( pos, app.particleRadius )

Code/Python/Kamaelia/Examples/GraphVisualisation/BasicGraphVisualisation/PhysApp1.py

@@ -26,7 +26,6 @@
 import Kamaelia.UI.MH
 
 import pygame
-from pygame.locals import *
 
 from random import randrange
 import random
@@ -99,8 +98,8 @@ def makeParticle(self, label, position, nodetype, particleRadius):
         self.physics.add( particle )
 
     def initialiseComponent(self):
-        self.addHandler(MOUSEBUTTONDOWN, lambda event: ParticleDragger(event,self))
-        self.addHandler(KEYDOWN, self.quit)
+        self.addHandler(pygame.MOUSEBUTTONDOWN, lambda event: ParticleDragger(event,self))
+        self.addHandler(pygame.KEYDOWN, self.quit)
 
         self.laws    = Kamaelia.Support.Particles.SimpleLaws(bondLength = 100)
         self.physics = Kamaelia.Support.Particles.ParticleSystem(self.laws, [], 0)

Code/Python/Kamaelia/Examples/GraphVisualisation/BasicGraphVisualisation/VisibleParticle.py

@@ -26,7 +26,6 @@
 import UI
 
 import pygame
-from pygame.locals import *
 
 from random import randrange
 import random
@@ -97,8 +96,8 @@ def makeParticle(self, label, position, nodetype, particleRadius):
         self.physics.add( particle )
 
     def initialiseComponent(self):
-        self.addHandler(MOUSEBUTTONDOWN, lambda event: ParticleDragger(event,self))
-        self.addHandler(KEYDOWN, self.quit)
+        self.addHandler(pygame.MOUSEBUTTONDOWN, lambda event: ParticleDragger(event,self))
+        self.addHandler(pygame.KEYDOWN, self.quit)
 
         self.laws    = Physics.Simple.SimpleLaws(bondLength = 100)
         self.physics = Physics.Simple.ParticleSystem(self.laws, [], 0)