diff --git a/cms/djangoapps/contentstore/views/assets.py b/cms/djangoapps/contentstore/views/assets.py index 2be2cfafb8..3765bc004e 100644 --- a/cms/djangoapps/contentstore/views/assets.py +++ b/cms/djangoapps/contentstore/views/assets.py @@ -227,11 +227,9 @@ def generate_export_course(request, org, course, name): root_dir = path(mkdtemp()) # export out to a tempdir - logging.debug('root = {0}'.format(root_dir)) export_to_xml(modulestore('direct'), contentstore(), loc, root_dir, name, modulestore()) - # filename = root_dir / name + '.tar.gz' logging.debug('tar file being generated at {0}'.format(export_file.name)) tar_file = tarfile.open(name=export_file.name, mode='w:gz') diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py index 57f3d756b9..f6de469622 100644 --- a/common/djangoapps/student/models.py +++ b/common/djangoapps/student/models.py @@ -625,7 +625,6 @@ class Registration(models.Model): def activate(self): self.user.is_active = True self.user.save() - # self.delete() class PendingNameChange(models.Model): diff --git a/common/lib/xmodule/xmodule/util/date_utils.py b/common/lib/xmodule/xmodule/util/date_utils.py index 050d65fcf1..e128d6eab7 100644 --- a/common/lib/xmodule/xmodule/util/date_utils.py +++ b/common/lib/xmodule/xmodule/util/date_utils.py @@ -12,7 +12,7 @@ def get_default_time_display(dt, show_timezone=True): if dt is not None and show_timezone: if dt.tzinfo is not None: try: - timezone = dt.tzinfo.tzname(dt) + timezone = " " + dt.tzinfo.tzname(dt) except NotImplementedError: timezone = " UTC" else: