X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/73ef2b8442dc95f8b7279de812c30ac8626d5f39..2295af1947e8fe5777120462ea174ec1b044ebdb:/apps/catalogue/migrations/0003_from_hg.py diff --git a/apps/catalogue/migrations/0003_from_hg.py b/apps/catalogue/migrations/0003_from_hg.py index 1816af90..e542d508 100644 --- a/apps/catalogue/migrations/0003_from_hg.py +++ b/apps/catalogue/migrations/0003_from_hg.py @@ -7,12 +7,11 @@ import re import urllib from django.db import models -from mercurial import hg, ui from south.db import db from south.v2 import DataMigration from django.conf import settings -from slughifi import slughifi +from slugify import slugify META_REGEX = re.compile(r'\s*', re.DOTALL | re.MULTILINE) STAGE_TAGS_RE = re.compile(r'^#stage-finished: (.*)$', re.MULTILINE) @@ -55,7 +54,7 @@ def gallery(slug, text): except ValueError: continue - gallery = result.get('gallery', slughifi(slug)) + gallery = result.get('gallery', slugify(slug)) if gallery.startswith('/'): gallery = os.path.basename(gallery) @@ -69,7 +68,7 @@ def migrate_file_from_hg(orm, fname, entry): if fname.endswith('.xml'): fname = fname[:-4] title = file_to_title(fname) - fname = slughifi(fname) + fname = slugify(fname) # create all the needed objects # what if it already exists? @@ -160,6 +159,8 @@ class Migration(DataMigration): except: print 'repository not configured, skipping' else: + from mercurial import hg, ui + print 'migrate from', hg_path repo = hg.repository(ui.ui(), hg_path) tip = repo['tip']