From ecfa0a83c1b567bc3b890eefadf1be589f72bccf Mon Sep 17 00:00:00 2001
From: Project Nayuki <me@nayuki.io>
Date: Wed, 22 Aug 2018 21:25:46 +0000
Subject: [PATCH] Simplified miscellaneous Java and Python application code.

---
 java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java | 11 +++--------
 python/qrcodegen-batch-test.py                    |  1 -
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java b/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java
index 6b6e880..dbcf233 100644
--- a/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java
+++ b/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java
@@ -28,11 +28,9 @@ package io.nayuki.qrcodegen;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.List;
 import javax.imageio.ImageIO;
@@ -64,11 +62,8 @@ public final class QrCodeGeneratorDemo {
 		ImageIO.write(img, "png", imgFile);             // Write image to file
 		
 		String svg = qr.toSvgString(4);  // Convert to SVG XML code
-		try (Writer out = new OutputStreamWriter(
-				new FileOutputStream("hello-world-QR.svg"),
-				StandardCharsets.UTF_8)) {
-			out.write(svg);  // Create/overwrite file and write SVG data
-		}
+		Files.write(new File("hello-world-QR.svg").toPath(),
+			svg.getBytes(StandardCharsets.UTF_8));
 	}
 	
 	
diff --git a/python/qrcodegen-batch-test.py b/python/qrcodegen-batch-test.py
index fa92e52..5e6d729 100644
--- a/python/qrcodegen-batch-test.py
+++ b/python/qrcodegen-batch-test.py
@@ -24,7 +24,6 @@
 #   Software.
 # 
 
-from __future__ import print_function
 import itertools, random, subprocess, sys, time
 if sys.version_info.major < 3:
 	raise RuntimeError("Requires Python 3+")