split out utilities from ob.py to ob_util.py

ob/context.py

@@ -3,3 +3,4 @@
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
 import ob
+import ob_util

ob/ob.py

@@ -250,10 +250,6 @@ def from_ship_name(name, unscramble=True):
 		return addr
 
 
-def nth_planet_of_star(star, n):
-	return n * 65536 + star
-
-
 def is_syllable(set, syllable):
 	if not syllable or len(syllable) != 3:
 		return False
@@ -267,10 +263,3 @@ def is_prefix_syllable(syllable):
 
 def is_suffix_syllable(syllable):
 	return is_syllable(suffix, syllable)
-
-
-def generate_planets(star):
-	planet_index = 1
-	while planet_index < 65536:
-		yield nth_planet_of_star(star, planet_index)
-		planet_index += 1

ob/ob_util.py

@@ -0,0 +1,8 @@
+def nth_planet_of_star(star, n):
+	return n * 65536 + star
+
+def generate_planets(star):
+	planet_index = 1
+	while planet_index < 65536:
+		yield nth_planet_of_star(star, planet_index)
+		planet_index += 1

ob/test_ob.py

@@ -2,7 +2,7 @@
 
 from .context import ob
 
-class MyTest(unittest.TestCase):
+class ObTest(unittest.TestCase):
     def test_feen(self):
         self.assertEqual(ob.feen(0x10100), 0x63b30e1c)
 
@@ -60,12 +60,3 @@ def test_from_ship_name(self):
         self.assertEquals(ob.from_ship_name('marzod'), 0x100)
         self.assertEquals(ob.from_ship_name('doznec-marzod', unscramble=False), 0x10100)
         self.assertEquals(ob.from_ship_name('wicdev-wisryt'), 0x10100)
-
-    def test_generate_planets(self):
-        planets = ob.generate_planets(0x100)
-        self.assertEquals(planets.next(), 0x10100)
-        self.assertEquals(planets.next(), 0x20100)
-
-        planets = ob.generate_planets(0x4141)
-        self.assertEquals(planets.next(), 0x14141)
-        self.assertEquals(planets.next(), 0x24141)

ob/test_ob_util.py

@@ -0,0 +1,13 @@
+import unittest
+
+from .context import ob_util
+
+class ObUtilTest(unittest.TestCase):
+    def test_generate_planets(self):
+        planets = ob_util.generate_planets(0x100)
+        self.assertEquals(planets.next(), 0x10100)
+        self.assertEquals(planets.next(), 0x20100)
+
+        planets = ob_util.generate_planets(0x4141)
+        self.assertEquals(planets.next(), 0x14141)
+        self.assertEquals(planets.next(), 0x24141)

ob_cli.py

@@ -2,7 +2,7 @@
 
 import argparse
 
-from ob import ob
+from ob import ob, ob_util
 
 
 def print_addr(addr):
@@ -13,7 +13,7 @@ def print_addr(addr):
 
 
 def print_all_star_planets(star):
-	for planet in ob.generate_planets(star):
+	for planet in ob_util.generate_planets(star):
 		print_addr(planet)