From ca5ee87b1640f8b3a38af20c8cfc25692ea302f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 4 Jan 2016 17:00:21 +0100
Subject: [PATCH] Switch to io.StringIO

---
 fdroidserver/metadata.py    | 10 +++-------
 fdroidserver/rewritemeta.py |  7 ++-----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 52771fbd..e5750cb7 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -23,11 +23,7 @@ import re
 import glob
 import cgi
 import textwrap
-
-try:
-    from cStringIO import StringIO
-except:
-    from StringIO import StringIO
+import io
 
 import yaml
 # use libyaml if it is available
@@ -513,8 +509,8 @@ class DescriptionFormatter:
         self.laststate = self.stNONE
         self.text_html = ''
         self.text_txt = ''
-        self.html = StringIO()
-        self.text = StringIO()
+        self.html = io.StringIO()
+        self.text = io.StringIO()
         self.para_lines = []
         self.linkResolver = None
         self.linkResolver = linkres
diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index 651349cd..407cb512 100644
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -20,10 +20,7 @@
 from argparse import ArgumentParser
 import os
 import logging
-try:
-    from cStringIO import StringIO
-except:
-    from StringIO import StringIO
+import io
 
 import common
 import metadata
@@ -33,7 +30,7 @@ options = None
 
 
 def proper_format(app):
-    s = StringIO()
+    s = io.StringIO()
     # TODO: currently reading entire file again, should reuse first
     # read in metadata.py
     with open(app.metadatapath, 'r') as f: