From 1dfb7e5067394d2adb703b95025f9126148dcae6 Mon Sep 17 00:00:00 2001 From: Ronald Schaten Date: Tue, 9 Apr 2013 23:39:02 +0200 Subject: [PATCH] cleanup --- atomstrom.py | 3 ++- ddate.py | 3 ++- models/__init__.py | 26 ++------------------------ models/entry.py | 4 +--- models/feed.py | 5 ++--- models/feedinfo.py | 4 +--- 6 files changed, 10 insertions(+), 35 deletions(-) diff --git a/atomstrom.py b/atomstrom.py index ca9d7c7..eb646e8 100755 --- a/atomstrom.py +++ b/atomstrom.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -#coding: utf-8 from models import Base, Feed, Feedinfo, Entry @@ -217,3 +216,5 @@ def main(): if __name__ == '__main__': main() + +# -*- coding: utf-8 -*- diff --git a/ddate.py b/ddate.py index 2e4b933..e6636da 100644 --- a/ddate.py +++ b/ddate.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from datetime import datetime from calendar import isleap @@ -41,3 +40,5 @@ class ddate(object): if(self.dApostleHoliday): msg = u'%s\nCelebrate %s!' % (msg, strHolidayApostle) return msg + +# -*- coding: utf-8 -*- diff --git a/models/__init__.py b/models/__init__.py index c31de8f..7b18bad 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -1,31 +1,9 @@ -#!/usr/bin/env python -#coding: utf-8 - -#from sqlalchemy import create_engine, Table, Column, Integer, Text, String, Boolean, DateTime, MetaData, ForeignKey, desc -#from sqlalchemy.orm import sessionmaker, relation, backref from sqlalchemy.ext.declarative import declarative_base -#from datetime import datetime, timedelta -#from time import mktime -#import feedparser -#import re -#import sys -#import urllib -#import urllib2 -#import hn -#import html2text -#import ConfigParser -#import pprint -#from optparse import OptionParser -#from cStringIO import StringIO -#from email.mime.multipart import MIMEMultipart -#from email.mime.text import MIMEText -#from email.header import Header -#from email import Charset -#from email.generator import Generator -#import smtplib Base = declarative_base() from models.feed import Feed from models.feedinfo import Feedinfo from models.entry import Entry + +# -*- coding: utf-8 -*- diff --git a/models/entry.py b/models/entry.py index e4e3a70..ec370e9 100644 --- a/models/entry.py +++ b/models/entry.py @@ -1,6 +1,3 @@ -#!/usr/bin/env python -#coding: utf-8 - from sqlalchemy import Column, Integer, ForeignKey, String, Text, DateTime from datetime import datetime from time import mktime @@ -143,3 +140,4 @@ class Entry(Base): text += '\n\nEnclosures:\n%s' % self.enclosures return text +# -*- coding: utf-8 -*- diff --git a/models/feed.py b/models/feed.py index 397567d..87923d4 100644 --- a/models/feed.py +++ b/models/feed.py @@ -1,6 +1,3 @@ -#!/usr/bin/env python -#coding: utf-8 - from sqlalchemy import Column, Integer, String, Boolean, Enum from sqlalchemy.orm import relationship, backref from datetime import datetime @@ -107,3 +104,5 @@ class Feed(Base): def reset(self): self.entries[:] = [] self.feedinfo = None + +# -*- coding: utf-8 -*- diff --git a/models/feedinfo.py b/models/feedinfo.py index c932e77..2c961c6 100644 --- a/models/feedinfo.py +++ b/models/feedinfo.py @@ -1,6 +1,3 @@ -#!/usr/bin/env python -#coding: utf-8 - from sqlalchemy import Column, Integer, ForeignKey, String, DateTime from datetime import datetime, timedelta from random import randint @@ -56,3 +53,4 @@ class Feedinfo(Base): waitminutes = 0 self.nextfetch = (datetime.now() + timedelta(minutes=waitminutes)) +# -*- coding: utf-8 -*-