diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-06-06 14:39:30 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-06-06 14:39:30 -0300 |
| commit | c621fa7322b4f8151eb37b27f8aeae563cf6bd63 (patch) | |
| tree | 55b17318254974378e289f01ec68031ea1f834ad /src/leap/bitmask/gui/login.py | |
| parent | 4c550c558dcb554b3ea1bc0246492e39e8532886 (diff) | |
| parent | 6ab80f96b1ed14ccf96cae37ff207649a26a38ed (diff) | |
Merge branch 'release-0.5.2'0.5.2
Diffstat (limited to 'src/leap/bitmask/gui/login.py')
| -rw-r--r-- | src/leap/bitmask/gui/login.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/bitmask/gui/login.py b/src/leap/bitmask/gui/login.py index ac7ad878..f66e71d9 100644 --- a/src/leap/bitmask/gui/login.py +++ b/src/leap/bitmask/gui/login.py @@ -24,6 +24,7 @@ from ui_login import Ui_LoginWidget from leap.bitmask.config import flags from leap.bitmask.util import make_address +from leap.bitmask.util.credentials import USERNAME_REGEX from leap.bitmask.util.keyring_helpers import has_keyring from leap.bitmask.util.keyring_helpers import get_keyring from leap.common.check import leap_assert_type @@ -48,8 +49,6 @@ class LoginWidget(QtGui.QWidget): MAX_STATUS_WIDTH = 40 - BARE_USERNAME_REGEX = r"^[A-Za-z\d_]+$" - # Keyring KEYRING_KEY = "bitmask" @@ -87,7 +86,7 @@ class LoginWidget(QtGui.QWidget): self.ui.btnLogout.clicked.connect( self.logout) - username_re = QtCore.QRegExp(self.BARE_USERNAME_REGEX) + username_re = QtCore.QRegExp(USERNAME_REGEX) self.ui.lnUser.setValidator( QtGui.QRegExpValidator(username_re, self)) |