This substantially reduces the FreeIPA dependencies and allows
QR codes to fit in a standard terminal.

https://fedorahosted.org/freeipa/ticket/4430
From 95fddc3a24c5c22fc506ee11571da6c6c063243d Mon Sep 17 00:00:00 2001
From: Nathaniel McCallum <npmccal...@redhat.com>
Date: Wed, 10 Sep 2014 17:35:37 -0400
Subject: [PATCH] Update qrcode support for newer python-qrcode

This substantially reduces the FreeIPA dependencies and allows
QR codes to fit in a standard terminal.

https://fedorahosted.org/freeipa/ticket/4430
---
 freeipa.spec.in            | 4 ++--
 ipalib/plugins/otptoken.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index a3f1010eff40ba7552ecd28e9831d1d08fc9a454..b672ecb03bdd73c1a911a6a982ccd894bebcbce4 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -59,7 +59,7 @@ BuildRequires:  python-memcached
 BuildRequires:  sssd >= 1.9.2
 BuildRequires:  python-lxml
 BuildRequires:  python-pyasn1 >= 0.0.9a
-BuildRequires:  python-qrcode
+BuildRequires:  python-qrcode-core >= 5.0.0
 BuildRequires:  python-dns
 BuildRequires:  m2crypto
 BuildRequires:  check
@@ -248,7 +248,7 @@ Requires: python-nss >= 0.15
 Requires: python-lxml
 Requires: python-netaddr
 Requires: libipa_hbac-python
-Requires: python-qrcode
+Requires: python-qrcode-core >= 5.0.0
 Requires: python-pyasn1
 Requires: python-dateutil
 Requires: python-yubico
diff --git a/ipalib/plugins/otptoken.py b/ipalib/plugins/otptoken.py
index dfd010e7f8663b424d9c536907fcc93229181fa3..1bd85d4b952dc51ea800ed37c49b3c50aeb31492 100644
--- a/ipalib/plugins/otptoken.py
+++ b/ipalib/plugins/otptoken.py
@@ -246,7 +246,7 @@ class otptoken_add(LDAPCreate):
     msg_summary = _('Added OTP token "%(value)s"')
 
     takes_options = LDAPCreate.takes_options + (
-        Flag('qrcode?', label=_('Display QR code (requires wide terminal)')),
+        Flag('qrcode?', label=_('Display QR code')),
     )
 
     has_output_params = LDAPCreate.has_output_params + (
@@ -328,7 +328,7 @@ class otptoken_add(LDAPCreate):
             qr = qrcode.QRCode()
             qr.add_data(uri)
             qr.make()
-            qr.print_tty()
+            qr.print_ascii(tty=True)
             print "\n"
 
         return rv
-- 
2.1.0

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to