Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6CC0A200BC0 for ; Tue, 15 Nov 2016 20:07:28 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6B74B160AF2; Tue, 15 Nov 2016 19:07:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B5264160B03 for ; Tue, 15 Nov 2016 20:07:27 +0100 (CET) Received: (qmail 58607 invoked by uid 500); 15 Nov 2016 19:07:26 -0000 Mailing-List: contact commits-help@beam.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.incubator.apache.org Delivered-To: mailing list commits@beam.incubator.apache.org Received: (qmail 58598 invoked by uid 99); 15 Nov 2016 19:07:26 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Nov 2016 19:07:26 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 7AF1CC7A97 for ; Tue, 15 Nov 2016 19:07:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 8l3S_dfkuR77 for ; Tue, 15 Nov 2016 19:07:24 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 9F6635FCB6 for ; Tue, 15 Nov 2016 19:07:23 +0000 (UTC) Received: (qmail 58464 invoked by uid 99); 15 Nov 2016 19:07:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Nov 2016 19:07:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9FF5ADFCF0; Tue, 15 Nov 2016 19:07:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertwb@apache.org To: commits@beam.incubator.apache.org Date: Tue, 15 Nov 2016 19:07:23 -0000 Message-Id: <250e3a2c81944d8e9ba7643461514a80@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] incubator-beam git commit: Fix merge lint error archived-at: Tue, 15 Nov 2016 19:07:28 -0000 Fix merge lint error Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/8bf25269 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/8bf25269 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/8bf25269 Branch: refs/heads/python-sdk Commit: 8bf2526965dd319f654e7f995df940307fb2260f Parents: 9d805ee Author: Robert Bradshaw Authored: Tue Nov 15 11:06:27 2016 -0800 Committer: Robert Bradshaw Committed: Tue Nov 15 11:06:27 2016 -0800 ---------------------------------------------------------------------- sdks/python/apache_beam/io/textio.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8bf25269/sdks/python/apache_beam/io/textio.py ---------------------------------------------------------------------- diff --git a/sdks/python/apache_beam/io/textio.py b/sdks/python/apache_beam/io/textio.py index 4e94f87..9c89b68 100644 --- a/sdks/python/apache_beam/io/textio.py +++ b/sdks/python/apache_beam/io/textio.py @@ -244,7 +244,8 @@ class ReadFromText(PTransform): self._strip_trailing_newlines = strip_trailing_newlines self._coder = coder self._source = _TextSource(file_pattern, min_bundle_size, compression_type, - strip_trailing_newlines, coder, validate=validate) + strip_trailing_newlines, coder, + validate=validate) def apply(self, pvalue): return pvalue.pipeline | Read(self._source)