diff options
| author | Cédric Picard <cedric.picard@efrei.net> | 2014-11-30 00:21:42 +0100 |
|---|---|---|
| committer | Cédric Picard <cedric.picard@efrei.net> | 2014-11-30 00:21:42 +0100 |
| commit | 2f89470398977aea449205c8a179d51ae70a4fd4 (patch) | |
| tree | 9a0054133e9acbb6be458ca481a09ab484ff7cd6 | |
| parent | b2114a23f1d74ed02979cfcd83a37c4d2d8eacba (diff) | |
| parent | 7c6c10f8e5bae9f112dcde5f8cc3bf7bf178db41 (diff) | |
| download | pasteme-2f89470398977aea449205c8a179d51ae70a4fd4.tar.gz pasteme-2f89470398977aea449205c8a179d51ae70a4fd4.tar.bz2 pasteme-2f89470398977aea449205c8a179d51ae70a4fd4.zip | |
Merge branch 'master' of git://git.devys.org/pasteme
| -rwxr-xr-x | pasteme.py | 4 | ||||
| -rwxr-xr-x | scripts/pasteme | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -39,8 +39,8 @@ def route_paste_get(pid, pformat='colored'): return bottle.template('bad_format') path = pathbase / pid try: - with path.open() as fd: - content = fd.read() + with path.open(mode='rb') as fd: + content = fd.read().decode('utf8') except IOError: # use this template for all file based exception bottle.abort(404) diff --git a/scripts/pasteme b/scripts/pasteme index db4b641..fe1f720 100755 --- a/scripts/pasteme +++ b/scripts/pasteme @@ -6,5 +6,7 @@ if [ "$file" == "" ]; then file=- fi -cat "$file" \ - | curl -w '%{redirect_url}\n' --form 'content=<-' http://paste.devys.org/ +sed '1s/^/content=/' "$file" \ + | curl -w '%{redirect_url}\n' \ + -X POST -H "Content-Type: text/plain; charset=UTF-8" \ + --data-binary @- http://paste.devys.org/ |