From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 6/7] config: remove try_cat
Date: Sat, 28 May 2016 01:57:13 +0000 [thread overview]
Message-ID: <20160528015714.1325-7-e@80x24.org> (raw)
In-Reply-To: <20160528015714.1325-1-e@80x24.org>
It's moved into the Inbox module and we no longer use it
in WWW
---
lib/PublicInbox/Config.pm | 12 ------------
lib/PublicInbox/WWW.pm | 2 +-
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 35b24af..317d290 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -5,8 +5,6 @@
package PublicInbox::Config;
use strict;
use warnings;
-use base qw/Exporter/;
-our @EXPORT_OK = qw/try_cat/;
require PublicInbox::Inbox;
use PublicInbox::Spawn qw(popen_rd);
use File::Path::Expand qw/expand_filename/;
@@ -101,16 +99,6 @@ sub git_config_dump {
\%rv;
}
-sub try_cat {
- my ($path) = @_;
- my $rv;
- if (open(my $fh, '<', $path)) {
- local $/;
- $rv = <$fh>;
- }
- $rv;
-}
-
sub _fill {
my ($self, $pfx) = @_;
my $rv = {};
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index e8f1fbf..ab3cd5d 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -14,7 +14,7 @@ use 5.008;
use strict;
use warnings;
use Plack::Request;
-use PublicInbox::Config qw(try_cat);
+use PublicInbox::Config;
use URI::Escape qw(uri_escape_utf8 uri_unescape);
use constant SSOMA_URL => '//ssoma.public-inbox.org/';
use constant PI_URL => '//public-inbox.org/';
--
EW
next prev parent reply other threads:[~2016-05-28 1:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-28 1:57 [PATCH 0/7] miscellaneous cleanups Eric Wong
2016-05-28 1:57 ` [PATCH 1/7] t/plack: ensure we can cascade on common endpoints Eric Wong
2016-05-28 1:57 ` [PATCH 2/7] http: clarify comments about layering violation Eric Wong
2016-05-28 1:57 ` [PATCH 3/7] Makefile.PL: allow N to be overridden Eric Wong
2016-05-28 1:57 ` [PATCH 4/7] examples: config no longer supports atomUrl Eric Wong
2016-05-28 1:57 ` [PATCH 5/7] www: remove footer_html support Eric Wong
2016-05-28 1:57 ` Eric Wong [this message]
2016-05-28 1:57 ` [PATCH 7/7] remove redundant NewsGroup class Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160528015714.1325-7-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).