From 652befcfd1b9a010d4e8535b1a04e51679a3d1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 27 Aug 2008 11:16:13 +0200 Subject: [PATCH] Rename tryton in client to avoid double tryton module name --- bin/tryton | 4 ++-- tryton/__init__.py | 4 +--- tryton/{tryton.py => client.py} | 0 tryton/translate.py | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) rename tryton/{tryton.py => client.py} (100%) diff --git a/bin/tryton b/bin/tryton index d4ed6a24dd..4e57c0655e 100755 --- a/bin/tryton +++ b/bin/tryton @@ -7,5 +7,5 @@ try: sys.path.insert(0, os.path.dirname(DIR)) except: pass -import tryton -tryton.TrytonClient().run() +import tryton.main +tryton.client.TrytonClient().run() diff --git a/tryton/__init__.py b/tryton/__init__.py index 1e0e8991da..fc66b39ab6 100644 --- a/tryton/__init__.py +++ b/tryton/__init__.py @@ -1,4 +1,2 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -from tryton import * -import common -import rpc +import client diff --git a/tryton/tryton.py b/tryton/client.py similarity index 100% rename from tryton/tryton.py rename to tryton/client.py diff --git a/tryton/translate.py b/tryton/translate.py index 33edb58941..626983bd6e 100644 --- a/tryton/translate.py +++ b/tryton/translate.py @@ -4,7 +4,7 @@ import os import locale import gettext from version import PACKAGE -from tryton import CURRENT_DIR, PREFIX +from tryton.client import CURRENT_DIR, PREFIX import logging import gtk