From 43f98cd5a25b48992110b5aa2d344639c86a5f5c Mon Sep 17 00:00:00 2001
From: Martin Vidner <martin@vidner.net>
Date: Sat, 11 Jul 2009 15:19:52 +0200
Subject: [PATCH] Split utility functions, fixing 06 a bit.

---
 cnetworkmanager   | 28 ----------------------------
 connection06.py   |  2 ++
 svc_settings06.py |  1 +
 util.py           | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/cnetworkmanager b/cnetworkmanager
index 99e1ac0..537d108 100755
--- a/cnetworkmanager
+++ b/cnetworkmanager
@@ -15,9 +15,6 @@ if len(sys.argv) > 2 and sys.argv[1] == "--prefix":
     sys.path.append(prefix + "/share/cnetworkmanager");
 
 import os
-import string
-import re
-import time
 from optparse import OptionParser
 try:
     import dbus
@@ -87,31 +84,6 @@ def make_nm(opath):
            raise
         return cNM_07(opath, options)
 
-def opath_validchar(c):
-    # _ is also escaped even though it is valid
-    return \
-        string.ascii_letters.find(c) != -1 or \
-        string.digits.find(c) != -1
-
-def opath_escape(s):
-    r = ""
-    for c in s:
-        # TODO find a more elegant way
-        if not opath_validchar(c):
-            # "-" -> "_2d_"
-            c = "_%2x_" % ord(c)
-        r = r + c
-    return r
-
-def opath_unescape(s):
-    # "2d" -> "-"
-    unhex = lambda xx: chr(eval("0x"+xx))
-    # all "_2d_" -> "-"
-    return re.sub("_.._", lambda p: unhex(p.group()[1:3]), s)
-
-def dump_time(unixtime):
-    return time.asctime(time.localtime(unixtime))
-
 # main
 
 fail = False
diff --git a/connection06.py b/connection06.py
index 38e5c09..d44f370 100644
--- a/connection06.py
+++ b/connection06.py
@@ -1,3 +1,5 @@
+from util import *
+
 class cConnection_06:
     def __init__(self, applet, id):
         self.id = id
diff --git a/svc_settings06.py b/svc_settings06.py
index 9678f08..0d7c508 100644
--- a/svc_settings06.py
+++ b/svc_settings06.py
@@ -1,5 +1,6 @@
 import dbus.service
 from svc_settings import UserSettings
+from util import *
 
 class UserSettings_06(UserSettings):
     # conmaps is a list
diff --git a/util.py b/util.py
index 2725525..a70fe0c 100644
--- a/util.py
+++ b/util.py
@@ -1,3 +1,7 @@
+import string
+import re
+import time
+
 def bitmask_str(map, value):
     ret = []
     for mask in sorted(map.keys()):
@@ -9,3 +13,29 @@ def ssid_str(array):
     for b in array:
         s = s + ("%c" % b)
     return s
+
+def opath_validchar(c):
+    # _ is also escaped even though it is valid
+    return \
+        string.ascii_letters.find(c) != -1 or \
+        string.digits.find(c) != -1
+
+def opath_escape(s):
+    r = ""
+    for c in s:
+        # TODO find a more elegant way
+        if not opath_validchar(c):
+            # "-" -> "_2d_"
+            c = "_%2x_" % ord(c)
+        r = r + c
+    return r
+
+def opath_unescape(s):
+    # "2d" -> "-"
+    unhex = lambda xx: chr(eval("0x"+xx))
+    # all "_2d_" -> "-"
+    return re.sub("_.._", lambda p: unhex(p.group()[1:3]), s)
+
+def dump_time(unixtime):
+    return time.asctime(time.localtime(unixtime))
+
-- 
2.11.4.GIT