From e4d842cd5c1b66e43687f269adae4e4a4dcbaad7 Mon Sep 17 00:00:00 2001
From: Arturo Filastò <hellais@torproject.org>
Date: Fri, 19 Aug 2011 15:20:57 +0200
Subject: Fix setup.py installation script

---
 packages/torouter-web/src/tui/controllers/main.py     | 5 +++--
 packages/torouter-web/src/tui/controllers/network.py  | 5 +++--
 packages/torouter-web/src/tui/controllers/tor.py      | 5 +++--
 packages/torouter-web/src/tui/models/router_config.py | 2 +-
 packages/torouter-web/src/tui/utils/configuration.py  | 2 +-
 packages/torouter-web/src/tui/utils/session.py        | 2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'packages/torouter-web/src/tui')

diff --git a/packages/torouter-web/src/tui/controllers/main.py b/packages/torouter-web/src/tui/controllers/main.py
index 060caa6..fb925d3 100644
--- a/packages/torouter-web/src/tui/controllers/main.py
+++ b/packages/torouter-web/src/tui/controllers/main.py
@@ -1,6 +1,7 @@
 import web
-import view, config
-from view import render
+from tui import config
+from tui import view
+from tui.view import render
 from tui.utils import session 
 
 """
diff --git a/packages/torouter-web/src/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py
index cc46643..bf48f54 100644
--- a/packages/torouter-web/src/tui/controllers/network.py
+++ b/packages/torouter-web/src/tui/controllers/network.py
@@ -1,6 +1,7 @@
 import web
-import view, config
-from view import render
+from tui import config
+from tui import view
+from tui.view import render
 from tui.utils import session,configuration,parsing
 
 """
diff --git a/packages/torouter-web/src/tui/controllers/tor.py b/packages/torouter-web/src/tui/controllers/tor.py
index eaa587d..bc66623 100644
--- a/packages/torouter-web/src/tui/controllers/tor.py
+++ b/packages/torouter-web/src/tui/controllers/tor.py
@@ -1,6 +1,7 @@
 import web
-import view, config
-from view import render
+from tui import config
+from tui import view
+from tui.view import render
 from tui.utils import session, parsing, fileio
 
 """
diff --git a/packages/torouter-web/src/tui/models/router_config.py b/packages/torouter-web/src/tui/models/router_config.py
index e83f9aa..a9bd975 100644
--- a/packages/torouter-web/src/tui/models/router_config.py
+++ b/packages/torouter-web/src/tui/models/router_config.py
@@ -1,5 +1,5 @@
 import web
-from config import db
+from tui.config import db
 
 def new_config(conf):
   db.insert('router_config', 
diff --git a/packages/torouter-web/src/tui/utils/configuration.py b/packages/torouter-web/src/tui/utils/configuration.py
index ba3d251..7133443 100644
--- a/packages/torouter-web/src/tui/utils/configuration.py
+++ b/packages/torouter-web/src/tui/utils/configuration.py
@@ -1,5 +1,5 @@
 import web
-import config
+from tui import config
 
 def get(name):
   conf = {}
diff --git a/packages/torouter-web/src/tui/utils/session.py b/packages/torouter-web/src/tui/utils/session.py
index a554dad..4570196 100644
--- a/packages/torouter-web/src/tui/utils/session.py
+++ b/packages/torouter-web/src/tui/utils/session.py
@@ -1,5 +1,5 @@
 import web
-import config
+from tui import config
 
 # The main session class
   
-- 
cgit v1.2.3