From f87884dd8dce026a996ec7a7ea3a6083561eb006 Mon Sep 17 00:00:00 2001
From: Jakub Roztocil <jakub@roztocil.name>
Date: Thu, 1 Aug 2013 08:46:37 +0200
Subject: [PATCH] README

---
 README.rst | 7 ++++++-
 setup.py   | 7 +------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.rst b/README.rst
index d7cf3692..9acf7ca4 100644
--- a/README.rst
+++ b/README.rst
@@ -709,7 +709,12 @@ On OS X, you can send the contents of the clipboard with ``pbpaste``:
 
 
 Passing data through ``stdin`` cannot be combined with data fields specified
-on the command line.
+on the command line:
+
+
+.. code-block:: bash
+
+    $ echo 'data' | http POST example.org more=data   # This is invalid
 
 
 -------------------------
diff --git a/setup.py b/setup.py
index 058c8de2..203734e4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,5 @@
 import os
 import sys
-import re
 import codecs
 from setuptools import setup
 import httpie
@@ -24,12 +23,8 @@ if 'win32' in str(sys.platform).lower():
 
 
 def long_description():
-    """Pre-process the README so that PyPi can render it properly."""
     with codecs.open('README.rst', encoding='utf8') as f:
-        rst = f.read()
-    code_block = '(:\n\n)?\.\. code-block::.*'
-    rst = re.sub(code_block, '::', rst)
-    return rst
+        return f.read()
 
 
 setup(