From 91f8affaa2cc33c7750ed18926e1eaab821d8c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Tue, 24 Nov 2015 16:55:24 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Нельзя импортировать переменные из другой секции
---
 pym/client/variables/action.py | 2 +-
 pym/client/variables/client.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pym/client/variables/action.py b/pym/client/variables/action.py
index 0717c84..3eb9efe 100644
--- a/pym/client/variables/action.py
+++ b/pym/client/variables/action.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2008-2013 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2008-2015 Calculate Ltd. http://www.calculate-linux.org
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
diff --git a/pym/client/variables/client.py b/pym/client/variables/client.py
index 32fbae8..734130f 100644
--- a/pym/client/variables/client.py
+++ b/pym/client/variables/client.py
@@ -26,7 +26,7 @@ from calculate.lib.utils.files import (isMount, readFile, find,
                                        FindFileType)
 from calculate.lib.utils.common import getValueFromCmdLine
 from calculate.lib.utils.portage import isPkgInstalled
-from calculate.lib.variables.user import VariableUrLogin
+from calculate.lib.variables import user
 from calculate.lib.convertenv import convertEnv
 from calculate.lib.utils.ip import isOpenPort
 import time
@@ -271,7 +271,7 @@ class VariableUrUserNewPw(Variable):
             raise VariableError(_("Empty password"))
 
 
-class VariableClClientLogin(VariableUrLogin):
+class VariableClClientLogin(user.VariableUrLogin):
     """
     User Login
     """
@@ -279,7 +279,7 @@ class VariableClClientLogin(VariableUrLogin):
     alias = "ur_login"
 
     def choice(self):
-        loginChoice = VariableUrLogin.choice(self)
+        loginChoice = user.VariableUrLogin.choice(self)
         if self.Get('cl_action') == 'passwd':
             return filter(lambda x: x != "root", loginChoice)
         else: