devnginx

migration/tables/comments.py

@@ -2,8 +2,8 @@ from datetime import datetime
 from dateutil.parser import parse as date_parse
 from orm import Reaction, User
 from orm import reaction
-from orm.base import local_session
-from migration.html2text import html2text
+from base.orm import local_session
+from html2text import html2text
 from orm.reaction import ReactionKind
 from orm.shout import Shout
 

migration/tables/content_items.py

@@ -1,11 +1,11 @@
 from dateutil.parser import parse as date_parse
 import sqlalchemy
 from orm.shout import Shout, ShoutTopic, User
-from storages.viewed import ViewedByDay
+from services.stat.viewed import ViewedByDay
 from transliterate import translit
 from datetime import datetime
-from orm.base import local_session
-from migration.extract import prepare_html_body
+from base.orm import local_session
+from extract import prepare_html_body
 from orm.community import Community
 from orm.reaction import Reaction, ReactionKind
 

migration/tables/topics.py

@@ -1,5 +1,5 @@
-from migration.extract import extract_md, html2text
-from orm.base import local_session
+from extract import extract_md, html2text
+from base.orm import local_session
 from orm import Topic, Community
 
 def migrate(entry):

migration/tables/users.py

@@ -1,8 +1,8 @@
 import sqlalchemy
-from migration.html2text import html2text
+from html2text import html2text
 from orm import User, UserRating
 from dateutil.parser import parse
-from orm.base import local_session
+from base.orm import local_session
 
 def migrate(entry):
 	if 'subscribedTo' in entry: del entry['subscribedTo']