From 692f3f008bec297616495e505fcf5db9fa2ac0f3 Mon Sep 17 00:00:00 2001 From: Project Nayuki Date: Mon, 23 Oct 2017 03:55:48 +0000 Subject: [PATCH] Clarified Python demo code by importing classes into current namespace. --- python/qrcodegen-demo.py | 56 ++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/python/qrcodegen-demo.py b/python/qrcodegen-demo.py index 876e94e..50e975e 100644 --- a/python/qrcodegen-demo.py +++ b/python/qrcodegen-demo.py @@ -25,7 +25,7 @@ # from __future__ import print_function -import qrcodegen +from qrcodegen import QrCode, QrSegment def main(): @@ -42,10 +42,10 @@ def main(): def do_basic_demo(): """Creates a single QR Code, then prints it to the console.""" text = u"Hello, world!" # User-supplied Unicode text - errcorlvl = qrcodegen.QrCode.Ecc.LOW # Error correction level + errcorlvl = QrCode.Ecc.LOW # Error correction level # Make and print the QR Code symbol - qr = qrcodegen.QrCode.encode_text(text, errcorlvl) + qr = QrCode.encode_text(text, errcorlvl) print_qr(qr) print(qr.to_svg_str(4)) @@ -54,26 +54,26 @@ def do_variety_demo(): """Creates a variety of QR Codes that exercise different features of the library, and prints each one to the console.""" # Numeric mode encoding (3.33 bits per digit) - qr = qrcodegen.QrCode.encode_text("314159265358979323846264338327950288419716939937510", qrcodegen.QrCode.Ecc.MEDIUM) + qr = QrCode.encode_text("314159265358979323846264338327950288419716939937510", QrCode.Ecc.MEDIUM) print_qr(qr) # Alphanumeric mode encoding (5.5 bits per character) - qr = qrcodegen.QrCode.encode_text("DOLLAR-AMOUNT:$39.87 PERCENTAGE:100.00% OPERATIONS:+-*/", qrcodegen.QrCode.Ecc.HIGH) + qr = QrCode.encode_text("DOLLAR-AMOUNT:$39.87 PERCENTAGE:100.00% OPERATIONS:+-*/", QrCode.Ecc.HIGH) print_qr(qr) # Unicode text as UTF-8 - qr = qrcodegen.QrCode.encode_text(u"\u3053\u3093\u306B\u3061\u0077\u0061\u3001\u4E16\u754C\uFF01\u0020\u03B1\u03B2\u03B3\u03B4", qrcodegen.QrCode.Ecc.QUARTILE) + qr = QrCode.encode_text(u"\u3053\u3093\u306B\u3061\u0077\u0061\u3001\u4E16\u754C\uFF01\u0020\u03B1\u03B2\u03B3\u03B4", QrCode.Ecc.QUARTILE) print_qr(qr) # Moderately large QR Code using longer text (from Lewis Carroll's Alice in Wonderland) - qr = qrcodegen.QrCode.encode_text( + qr = QrCode.encode_text( "Alice was beginning to get very tired of sitting by her sister on the bank, " "and of having nothing to do: once or twice she had peeped into the book her sister was reading, " "but it had no pictures or conversations in it, 'and what is the use of a book,' thought Alice " "'without pictures or conversations?' So she was considering in her own mind (as well as she could, " "for the hot day made her feel very sleepy and stupid), whether the pleasure of making a " "daisy-chain would be worth the trouble of getting up and picking the daisies, when suddenly " - "a White Rabbit with pink eyes ran close by her.", qrcodegen.QrCode.Ecc.HIGH) + "a White Rabbit with pink eyes ran close by her.", QrCode.Ecc.HIGH) print_qr(qr) @@ -83,32 +83,32 @@ def do_segment_demo(): # Illustration "silver" silver0 = "THE SQUARE ROOT OF 2 IS 1." silver1 = "41421356237309504880168872420969807856967187537694807317667973799" - qr = qrcodegen.QrCode.encode_text(silver0 + silver1, qrcodegen.QrCode.Ecc.LOW) + qr = QrCode.encode_text(silver0 + silver1, QrCode.Ecc.LOW) print_qr(qr) segs = [ - qrcodegen.QrSegment.make_alphanumeric(silver0), - qrcodegen.QrSegment.make_numeric(silver1)] - qr = qrcodegen.QrCode.encode_segments(segs, qrcodegen.QrCode.Ecc.LOW) + QrSegment.make_alphanumeric(silver0), + QrSegment.make_numeric(silver1)] + qr = QrCode.encode_segments(segs, QrCode.Ecc.LOW) print_qr(qr) # Illustration "golden" golden0 = u"Golden ratio \u03C6 = 1." golden1 = u"6180339887498948482045868343656381177203091798057628621354486227052604628189024497072072041893911374" golden2 = u"......" - qr = qrcodegen.QrCode.encode_text(golden0 + golden1 + golden2, qrcodegen.QrCode.Ecc.LOW) + qr = QrCode.encode_text(golden0 + golden1 + golden2, QrCode.Ecc.LOW) print_qr(qr) segs = [ - qrcodegen.QrSegment.make_bytes(golden0.encode("UTF-8")), - qrcodegen.QrSegment.make_numeric(golden1), - qrcodegen.QrSegment.make_alphanumeric(golden2)] - qr = qrcodegen.QrCode.encode_segments(segs, qrcodegen.QrCode.Ecc.LOW) + QrSegment.make_bytes(golden0.encode("UTF-8")), + QrSegment.make_numeric(golden1), + QrSegment.make_alphanumeric(golden2)] + qr = QrCode.encode_segments(segs, QrCode.Ecc.LOW) print_qr(qr) # Illustration "Madoka": kanji, kana, Greek, Cyrillic, full-width Latin characters madoka = u"\u300C\u9B54\u6CD5\u5C11\u5973\u307E\u3069\u304B\u2606\u30DE\u30AE\u30AB\u300D\u3063\u3066\u3001\u3000\u0418\u0410\u0418\u3000\uFF44\uFF45\uFF53\uFF55\u3000\u03BA\u03B1\uFF1F" - qr = qrcodegen.QrCode.encode_text(madoka, qrcodegen.QrCode.Ecc.LOW) + qr = QrCode.encode_text(madoka, QrCode.Ecc.LOW) print_qr(qr) kanjiCharBits = [ # Kanji mode encoding (13 bits per character) @@ -142,8 +142,8 @@ def do_segment_demo(): 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, ] - segs = [qrcodegen.QrSegment(qrcodegen.QrSegment.Mode.KANJI, len(kanjiCharBits) // 13, kanjiCharBits)] - qr = qrcodegen.QrCode.encode_segments(segs, qrcodegen.QrCode.Ecc.LOW) + segs = [QrSegment(QrSegment.Mode.KANJI, len(kanjiCharBits) // 13, kanjiCharBits)] + qr = QrCode.encode_segments(segs, QrCode.Ecc.LOW) print_qr(qr) @@ -151,21 +151,21 @@ def do_mask_demo(): """Creates QR Codes with the same size and contents but different mask patterns.""" # Project Nayuki URL - segs = qrcodegen.QrSegment.make_segments("https://www.nayuki.io/") - print_qr(qrcodegen.QrCode.encode_segments(segs, qrcodegen.QrCode.Ecc.HIGH, mask=-1)) # Automatic mask - print_qr(qrcodegen.QrCode.encode_segments(segs, qrcodegen.QrCode.Ecc.HIGH, mask=3)) # Force mask 3 + segs = QrSegment.make_segments("https://www.nayuki.io/") + print_qr(QrCode.encode_segments(segs, QrCode.Ecc.HIGH, mask=-1)) # Automatic mask + print_qr(QrCode.encode_segments(segs, QrCode.Ecc.HIGH, mask=3)) # Force mask 3 # Chinese text as UTF-8 - segs = qrcodegen.QrSegment.make_segments( + segs = QrSegment.make_segments( u"\u7DAD\u57FA\u767E\u79D1\uFF08\u0057\u0069\u006B\u0069\u0070\u0065\u0064\u0069\u0061\uFF0C" "\u8046\u807D\u0069\u002F\u02CC\u0077\u026A\u006B\u1D7B\u02C8\u0070\u0069\u02D0\u0064\u0069" "\u002E\u0259\u002F\uFF09\u662F\u4E00\u500B\u81EA\u7531\u5167\u5BB9\u3001\u516C\u958B\u7DE8" "\u8F2F\u4E14\u591A\u8A9E\u8A00\u7684\u7DB2\u8DEF\u767E\u79D1\u5168\u66F8\u5354\u4F5C\u8A08" "\u756B") - print_qr(qrcodegen.QrCode.encode_segments(segs, qrcodegen.QrCode.Ecc.MEDIUM, mask=0)) # Force mask 0 - print_qr(qrcodegen.QrCode.encode_segments(segs, qrcodegen.QrCode.Ecc.MEDIUM, mask=1)) # Force mask 1 - print_qr(qrcodegen.QrCode.encode_segments(segs, qrcodegen.QrCode.Ecc.MEDIUM, mask=5)) # Force mask 5 - print_qr(qrcodegen.QrCode.encode_segments(segs, qrcodegen.QrCode.Ecc.MEDIUM, mask=7)) # Force mask 7 + print_qr(QrCode.encode_segments(segs, QrCode.Ecc.MEDIUM, mask=0)) # Force mask 0 + print_qr(QrCode.encode_segments(segs, QrCode.Ecc.MEDIUM, mask=1)) # Force mask 1 + print_qr(QrCode.encode_segments(segs, QrCode.Ecc.MEDIUM, mask=5)) # Force mask 5 + print_qr(QrCode.encode_segments(segs, QrCode.Ecc.MEDIUM, mask=7)) # Force mask 7