fix import modules

master3.3
Denis Spiridonov 12 years ago
parent dc405fb05e
commit 3870e7e165

@ -15,7 +15,6 @@
# limitations under the License. # limitations under the License.
import socket import socket
from M2Crypto import RSA, X509, EVP, m2
from PySide import QtGui, QtCore from PySide import QtGui, QtCore
from more import LabelWordWrap, show_msg from more import LabelWordWrap, show_msg
@ -26,9 +25,11 @@ def passphrase_callback(v):
return str(v) return str(v)
def generateRSAKey(): def generateRSAKey():
from M2Crypto import RSA, m2
return RSA.gen_key(2048, m2.RSA_F4) return RSA.gen_key(2048, m2.RSA_F4)
def makePKey(key): def makePKey(key):
from M2Crypto import EVP
pkey = EVP.PKey() pkey = EVP.PKey()
pkey.assign_rsa(key) pkey.assign_rsa(key)
return pkey return pkey
@ -140,7 +141,7 @@ class RequestCreate (QtGui.QWidget):
show_msg(_('The \"Country\" field must be two-character'), \ show_msg(_('The \"Country\" field must be two-character'), \
_('Input error')) _('Input error'))
return return
from M2Crypto import X509
######################################### #########################################
private_key_passwd = self.passwd_lineedit.text() private_key_passwd = self.passwd_lineedit.text()
rsa = generateRSAKey() rsa = generateRSAKey()

@ -469,7 +469,7 @@ class MainFrame(QtGui.QWidget):
if field.uncompatible: if field.uncompatible:
self.view_dict[field.name].setToolTip(field.uncompatible) self.view_dict[field.name].setToolTip(field.uncompatible)
self.view_dict[field.name].setDisabled(True) self.view_dict[field.name].setDisabled(True)
self.grid.addWidget(self.view_dict[field.name], x, y+1) self.grid.addWidget(self.view_dict[field.name], x, y+1)
self.error_label_dict[field.name] = ErrorLabel(self) self.error_label_dict[field.name] = ErrorLabel(self)

@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: console_gui_translate\n" "Project-Id-Version: console_gui_translate\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-27 09:27+0300\n" "POT-Creation-Date: 2012-06-27 14:19+0300\n"
"PO-Revision-Date: 2012-06-27 09:28+0300\n" "PO-Revision-Date: 2012-06-27 14:20+0300\n"
"Last-Translator: Denis <ds@mail.ru>\n" "Last-Translator: Denis <ds@mail.ru>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: \n" "Language: \n"
@ -52,25 +52,25 @@ msgstr "При закрытии сессии данные %d процессa б
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:419 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:419
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:173 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:173
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:700 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:702
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1957 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1959
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2284 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2286
msgid "Yes" msgid "Yes"
msgstr "Да" msgstr "Да"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:420 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:420
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:174 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:174
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:702 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:704
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1959 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1961
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2285 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2287
msgid "No" msgid "No"
msgstr "Нет" msgstr "Нет"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:425 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:425
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:116 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:117
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:891 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:893
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1075 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1077
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2050 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2052
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:50 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:50
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:132 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:132
msgid "Cancel" msgid "Cancel"
@ -179,48 +179,48 @@ msgstr "Процесс id %d не найден"
msgid "Permission denied" msgid "Permission denied"
msgstr "Доступ запрещён" msgstr "Доступ запрещён"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:54 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:55
msgid "User@Server_HostName" msgid "User@Server_HostName"
msgstr "Пользователь@Имя_сервера" msgstr "Пользователь@Имя_сервера"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:63 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:64
msgid "User Name" msgid "User Name"
msgstr "Имя пользователя" msgstr "Имя пользователя"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:69 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:70
msgid "Organization Name" msgid "Organization Name"
msgstr "Название организации" msgstr "Название организации"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:75 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:76
msgid "Network address" msgid "Network address"
msgstr "Сетевой адрес" msgstr "Сетевой адрес"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:81 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:82
msgid "State Name" msgid "State Name"
msgstr "Город" msgstr "Город"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:88 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:89
msgid "Country (a two-character tag)" msgid "Country (a two-character tag)"
msgstr "Страна (2 символа)" msgstr "Страна (2 символа)"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:102 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:103
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1830 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1832
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2034 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2036
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:36 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:36
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:85 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:85
msgid "Password" msgid "Password"
msgstr "Пароль" msgstr "Пароль"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:109 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:110
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:128 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:129
msgid "Create a signature request" msgid "Create a signature request"
msgstr "Создать запрос на подпись сертификата" msgstr "Создать запрос на подпись сертификата"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:140 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:141
msgid "The \"Country\" field must be two-character" msgid "The \"Country\" field must be two-character"
msgstr "Поле \"Страна\" должно состоять из двух символов" msgstr "Поле \"Страна\" должно состоять из двух символов"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:141 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:142
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:141 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:141
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:231 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:231
msgid "Input error" msgid "Input error"
@ -283,7 +283,7 @@ msgstr "Не удалось завершить процесс!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:168 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:168
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:53 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:53
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:138 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:138
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:224 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:225
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:124 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:124
msgid "Close" msgid "Close"
msgstr "Закрыть" msgstr "Закрыть"
@ -383,9 +383,9 @@ msgid "Send a Bug"
msgstr "Отправить ошибку" msgstr "Отправить ошибку"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:183 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:183
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:179 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:181
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:330 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:332
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:393 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:395
msgid "Report Bug" msgid "Report Bug"
msgstr "Сообщить об ошибке" msgstr "Сообщить об ошибке"
@ -406,7 +406,7 @@ msgid "Previous"
msgstr "Назад" msgstr "Назад"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:163 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:163
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2045 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2047
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:43 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:43
msgid "Ok" msgid "Ok"
msgstr "Ok" msgstr "Ok"
@ -415,7 +415,7 @@ msgstr "Ok"
msgid "Next" msgid "Next"
msgstr "Далее" msgstr "Далее"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:241 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:242
msgid "Error when closing the process" msgid "Error when closing the process"
msgstr "Ошибка закрытия процесса" msgstr "Ошибка закрытия процесса"
@ -516,79 +516,89 @@ msgstr "Кэш сессии удалён"
msgid "User should be not root" msgid "User should be not root"
msgstr "Пользователь должен быть не root" msgstr "Пользователь должен быть не root"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:145 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:27
#, python-format
msgid "No module named %s"
msgstr "Нет модуля %s"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:28
#, python-format
msgid "Cannot import name %s"
msgstr "Не удалось импортировать %s"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:147
msgid "About" msgid "About"
msgstr "О программе" msgstr "О программе"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:162 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:164
msgid "Info" msgid "Info"
msgstr "Справка" msgstr "Справка"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:488 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:490
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:599 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:601
msgid "Open" msgid "Open"
msgstr "Открыть" msgstr "Открыть"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:698 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:700
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1961 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1963
msgid "Auto" msgid "Auto"
msgstr "Авто" msgstr "Авто"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1026 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1028
msgid "Clear the table" msgid "Clear the table"
msgstr "Очистить таблицу" msgstr "Очистить таблицу"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1127 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1129
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1266 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1268
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1332 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1334
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1445 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1447
msgid "Add a row" msgid "Add a row"
msgstr "Добавить строку" msgstr "Добавить строку"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1138 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1140
msgid "Recover the table" msgid "Recover the table"
msgstr "Восстановить таблицу" msgstr "Восстановить таблицу"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1182 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1184
msgid "Check all" msgid "Check all"
msgstr "Отметить все" msgstr "Отметить все"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1345 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1347
msgid "Reset" msgid "Reset"
msgstr "Сбросить изменения" msgstr "Сбросить изменения"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1833 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1835
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2040 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2042
msgid "Repeat" msgid "Repeat"
msgstr "Повтор" msgstr "Повтор"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2154 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2156
msgid "Break the process" msgid "Break the process"
msgstr "Прервать процесс" msgstr "Прервать процесс"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2318 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2320
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:360 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:360
msgid "You do not have a certificate. Please generate a new request and get a new certificate from the server." msgid "You do not have a certificate. Please generate a new request and get a new certificate from the server."
msgstr "У Вас нет сертификата. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера." msgstr "У Вас нет сертификата. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера."
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2399 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2401
msgid "No methods available!" msgid "No methods available!"
msgstr "Нет доступных методов!" msgstr "Нет доступных методов!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2428 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2430
msgid "No access to the file!" msgid "No access to the file!"
msgstr "Нет доступа к файлу!" msgstr "Нет доступа к файлу!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2431 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2433
msgid "Failed to obtain certificate data!" msgid "Failed to obtain certificate data!"
msgstr "Не удалось получить данные сертификата!" msgstr "Не удалось получить данные сертификата!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2434 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2436
#, python-format #, python-format
msgid "Permission denied %s" msgid "Permission denied %s"
msgstr "Доступ запрещён %s" msgstr "Доступ запрещён %s"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2445 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2447
msgid "Error removing the session from the server" msgid "Error removing the session from the server"
msgstr "Ошибка удаления сессии на сервере" msgstr "Ошибка удаления сессии на сервере"
@ -1085,12 +1095,12 @@ msgstr "Удалить строку"
msgid "View options" msgid "View options"
msgstr "Просмотреть параметры" msgstr "Просмотреть параметры"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2257 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2255
msgid " Step " msgid " Step "
msgstr " Шаг " msgstr " Шаг "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2260 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2258
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2264 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2262
msgid "Run" msgid "Run"
msgstr "Выполнение" msgstr "Выполнение"

@ -4,8 +4,6 @@
import sys, os, pwd import sys, os, pwd
from PySide import QtGui from PySide import QtGui
from calculate.consolegui.application.ConnectionTabs import ToolTabWidget, \
DBusWidget, parse, SelectedMethodWgt
from calculate.consolegui.application.more import getRunProc, owner, _print from calculate.consolegui.application.more import getRunProc, owner, _print
import __builtin__ import __builtin__
import dbus import dbus
@ -24,6 +22,8 @@ class Application(QtGui.QApplication):
return QtGui.QApplication.event(self, e) return QtGui.QApplication.event(self, e)
def main(): def main():
from calculate.consolegui.application.ConnectionTabs import ToolTabWidget,\
DBusWidget, parse, SelectedMethodWgt
__builtin__.__dict__['_print'] = _print __builtin__.__dict__['_print'] = _print
host, port, args = None, None, None host, port, args = None, None, None
if len(sys.argv) > 1: if len(sys.argv) > 1:
@ -96,4 +96,4 @@ def main():
sys.exit(app.exec_()) sys.exit(app.exec_())
if __name__=='__main__': if __name__=='__main__':
main() main()

Loading…
Cancel
Save