[shpy-commit] r2852 - shpy/trunk/dist/shpy

[hpk@codespeak.net]

Author: hpk
Date: Tue Jan 20 15:00:39 2004
New Revision: 2852

Added:
   shpy/trunk/dist/shpy/info.py
Modified:
   shpy/trunk/dist/shpy/ui_pygame.py
Log:
moved user/color configuration code into a new module ...



Added: shpy/trunk/dist/shpy/info.py
==============================================================================
--- (empty file)
+++ shpy/trunk/dist/shpy/info.py	Tue Jan 20 15:00:39 2004
@@ -0,0 +1,27 @@
+
+def getusername():
+    import os, pwd
+    try:
+        return os.getlogin()
+    except:
+        try:
+            return pwd.getpwuid(os.getuid())[0]
+        except:
+            import random
+            return 'somebody%d' % random.randrange(0, 100)
+
+def getcolor():
+    username = getusername()
+    try:
+        return {'arigo': (0x60, 0, 0),
+                'hpk':   (0, 0, 0x80),
+                'mwh':   (0, 0x60, 0x00),
+                }[username]
+    except KeyError:
+        import random
+        r = random.randrange(0, 0x80)
+        g = random.randrange(0, 0x80)
+        b = random.randrange(0, 0x80)
+        return (r, g, b)
+
+

Modified: shpy/trunk/dist/shpy/ui_pygame.py
==============================================================================
--- shpy/trunk/dist/shpy/ui_pygame.py	(original)
+++ shpy/trunk/dist/shpy/ui_pygame.py	Tue Jan 20 15:00:39 2004
@@ -5,6 +5,7 @@
 from pygame.locals import *
 import shpy.net.register
 from shpy.net.structure import Structure, representstructure, getstructureid
+from shpy import info 
 
 RESOLUTION = (768, 512)
 #RESOLUTION = (400, 300)
@@ -30,32 +31,6 @@
 ##    return image
 
 
-def getusername():
-    import os, pwd
-    try:
-        return os.getlogin()
-    except:
-        try:
-            return pwd.getpwuid(os.getuid())[0]
-        except:
-            import random
-            return 'somebody%d' % random.randrange(0, 100)
-
-def getcolor():
-    username = getusername()
-    try:
-        return {'arigo': (0x60, 0, 0),
-                'hpk':   (0, 0, 0x80),
-                'mwh':   (0, 0x60, 0x00),
-                }[username]
-    except KeyError:
-        import random
-        r = random.randrange(0, 0x80)
-        g = random.randrange(0, 0x80)
-        b = random.randrange(0, 0x80)
-        return (r, g, b)
-
-
 class Terminal:
     
     def __init__(self, hostport):
@@ -66,11 +41,11 @@
         pygame.display.set_mode(RESOLUTION, RESIZABLE)
         self.font = pygame.font.Font(FONT, HEIGHT)
         self.root = self.servergateway.registerclient()
-        username = getusername()
+        username = info.getusername()
         try:
             self.cursor = getattr(self.root.users, username)
         except AttributeError:
-            self.cursor = Structure(x=0, y=0, color=getcolor())
+            self.cursor = Structure(x=0, y=0, color=info.getcolor())
             setattr(self.root.users, username, self.cursor)
             self.notifychanges(self.cursor, self.root.users)
         print self.root.users.__dict__