Switch to io.StringIO

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 52771fbd6a3f30500338914347fa50553c7b7651..e5750cb7f819310b329e7a958be607d6989977c2 100644 (file)
--- 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 651349cd3fe60cc98663d3e57a6379550fd72540..407cb512c086b6c9e37566f6e719030ca039f5f5 100644 (file)
--- 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: