From 5c2b94462635c59abf985001c2c5c11e79a16dab Mon Sep 17 00:00:00 2001
From: twall <tomwallroth@gmail.com>
Date: Fri, 19 Sep 2014 20:05:12 +0200
Subject: [PATCH] added automatic markdown to rst conversion for pypi release

---
 README.md |  8 +++++---
 setup.py  | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 setup.py

diff --git a/README.md b/README.md
index cf2a8560..948d67d5 100644
--- a/README.md
+++ b/README.md
@@ -20,9 +20,11 @@ current features:
 You can find more information on the [CherryMusic website](http://www.fomori.org/cherrymusic)
 and in our [wiki](https://github.com/devsnd/cherrymusic/wiki).
 
-master | devel
---- | --- 
-[![Build Status](https://travis-ci.org/devsnd/cherrymusic.png?branch=master)](https://travis-ci.org/devsnd/cherrymusic) | [![Build Status](https://travis-ci.org/devsnd/cherrymusic.png?branch=devel)](https://travis-ci.org/devsnd/cherrymusic)
+master: [![Build Status Master](https://travis-ci.org/devsnd/cherrymusic.png?branch=master)](https://travis-ci.org/devsnd/cherrymusic)
+
+devel: [![Build Status Devel](https://travis-ci.org/devsnd/cherrymusic.png?branch=devel)](https://travis-ci.org/devsnd/cherrymusic)
+
+
  
 
 
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 987ddf8f..e0205e32
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 except ImportError:
     from distutils.core import setup
 import os
+import sys
 import codecs
 import cherrymusicserver
 from cherrymusicserver import pathprovider
@@ -76,7 +77,21 @@ def packagedata(pkgfolder, childpath=''):
 # files to put in /usr/share
 data_files = listFilesRec('res',shareFolder)
 
-long_description = "\n" + "\n".join([read('README.md')])
+long_description = None
+if 'upload' in sys.argv:
+    readmemd = "\n" + "\n".join([read('README.md')])
+    print("converting markdown to reStucturedText for upload to pypi.")
+    from urllib.request import urlopen
+    from urllib.parse import quote
+    import json
+
+    url = 'http://johnmacfarlane.net/cgi-bin/trypandoc?text=%s&from=markdown&to=rst'
+    urlhandler = urlopen(url % quote(readmemd))
+    result = json.loads(codecs.decode(urlhandler.read(), 'utf-8'))
+    
+    long_description = result['result']
+else:
+    long_description = "\n" + "\n".join([read('README.md')])
 
 setup_options = {
     'name': 'CherryMusic',