feeds: use FeddJSON for .tojson()

Clean up related code

morss/feeds.py

@@ -20,12 +20,6 @@ from wheezy.template.ext.core import CoreExtension
 
 json.encoder.c_make_encoder = None
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    # python < 2.7
-    from ordereddict import OrderedDict
-
 try:
     from StringIO import StringIO
     from urllib2 import urlopen
@@ -86,8 +80,7 @@ class ParserBase(object):
         pass
 
     def tojson(self, indent=None):
-        # TODO temporary
+        return self.convert(FeedJSON).tostring()
-        return json.dumps(OrderedDict(self.iterdic()), indent=indent)
 
     def tocsv(self):
         # TODO temporary
@@ -126,17 +119,6 @@ class ParserBase(object):
 
         return target
 
-    def iterdic(self):
-        for element in self.dic:
-            value = getattr(self, element)
-
-            if element == 'items':
-                value = [OrderedDict(x.iterdic()) for x in value]
-            elif isinstance(value, datetime):
-                value = value.isoformat()
-
-            yield element, value
-
     # RULE-BASED FUNCTIONS
 
     def rule_search(self, rule):