From 8f669f476860d0ce8cc6c8223a7f8901651bbf9d Mon Sep 17 00:00:00 2001 From: Pete Travis Date: Sep 12 2015 16:29:46 +0000 Subject: file stuff gets done all over --- diff --git a/src/anerist/cli.py b/src/anerist/cli.py index f413c4f..cf99079 100644 --- a/src/anerist/cli.py +++ b/src/anerist/cli.py @@ -1,12 +1,12 @@ import argparse import ConfigParser -from anerist import extractors +from anerist import extractors, file_handlers import sys import os rest_machine = extractors.rest() docbook_machine = extractors.docbook() -file_machine = extractors.file_handlers() +file_machine = file_handlers.file_handlers() class Cli(object): def __init__(self): diff --git a/src/anerist/extractors.py b/src/anerist/extractors.py index 5d7fe86..a1735be 100755 --- a/src/anerist/extractors.py +++ b/src/anerist/extractors.py @@ -5,8 +5,6 @@ import os import re import ConfigParser from bs4 import BeautifulSoup -import yaml -import json from docutils import core, io, nodes from docutils.parsers import rst from docutils.nodes import Special, Invisible, FixedTextElement @@ -185,27 +183,3 @@ class docbook(): interpolated_xml = self._substitute_entities(info, entity_filelist) meta = self._get_docbook_metadata(interpolated_xml, lang) return meta - -class file_handlers(): - def write_json(self, meta, output="metadata.json"): - f = open(output, 'w') - printable_json = json.dumps(meta, encoding="utf-8", indent=3) - f.write(printable_json) - f.close() - - def load_json(self, metadata="metadata.json"): - f = open(metadata, 'r') - meta = json.loads(f.read()) - return meta - - def load_yaml(self, metadata="metadata.yml"): - y = open(metadata) - meta = yaml.load(y) - y.close() - return meta - - def write_yaml(self, meta, metadata="metadata.yml"): - y = open('metadata.yml', 'w') - yaml.dump(meta, y, default_flow_style=False) - y.close() -