Changeset 1623:9a7af0c846ee in peach3-core

Timestamp:

02/02/2012 02:01:44 PM (4 months ago)

Author:

eriks

Branch:

core-split

Message:

A bunch of small changes and fixes

Files:

• setup.py (modified) (1 diff)
• src/peach3/core/report/submission.py (modified) (1 diff)
• src/peach3/managers/news.py (modified) (2 diffs)
• src/peach3/models/TEMP/stats.py (deleted)
• src/peach3/models/TEMP/utils.py (deleted)
• src/peach3/models/cluster.py (modified) (1 diff)
• src/peach3/utils/dates.py (modified) (1 diff)

setup.py

@@ -40 +40 @@
         'django-pdfviewer',
     ],
+    extras_require = {
+        'compare': ['peach3-compare'],
+        'daemon2': ['peach3-daemon2-compat'],
+    },
     packages = find_packages('src'),
     package_dir = {'': 'src'},
     package_data = {'': [
-        'locale/en/LC_MESSAGES/*.mo',
-        'locale/nl/LC_MESSAGES/*.mo',
+        #'locale/en/LC_MESSAGES/*.mo',
+        #'locale/nl/LC_MESSAGES/*.mo',
         #'templates/pwreset/help/*.html',
         #'templates/registration/help/*.html',

src/peach3/core/report/submission.py

@@ -87 +87 @@
                     arcpathparts.append(create_filename('', *[au.username for au in sb.get_authors()]))
                 if num_sbs>1:
-                    arcpathparts.append(self._format_date(self.user, sb.submitted))
+                    arcpathparts.append(self._format_date(sb.submitted))
                 arcpath = create_path(*arcpathparts)
 

src/peach3/managers/news.py

@@ -7 +7 @@
 class NewsItemManager(Manager):
     def create(self, **kwargs):
+        rnow = now()
+
+        kwargs.setdefault('created', rnow)
+        kwargs.setdefault('appears', rnow)
+
         # Expires attribute can be a timedelta object which will be converted into a datetime object
         expires = kwargs.get('expires', timedelta(days=365))
@@ -12 +17 @@
             kwargs['expires'] = kwargs['appears'] + expires
 
-        if kwargs['expires'] > now():
+        if kwargs['expires'] > rnow:
             return super(NewsItemManager, self).create(**kwargs)
 

src/peach3/models/cluster.py

@@ -155 +155 @@
         assert self.is_member(user)
 
-        if self.cluster.admin_cluster:
+        if self.admin_cluster:
             assert realm is None
         else:

src/peach3/utils/dates.py

@@ -215 +215 @@
     def __repr__(self):
         return 'TimeRange<%s>' % str(self)
-
-#    def to_form_value(self, user=None):
-#        """ Convert this TimeRange object to the format used by TimeRange widget """
-#
-#        if self.is_open():
-#            return 'open'
-#        elif self.is_closed():
-#            return 'closed'
-#
-#        s=['range']
-#
-#        if self.has_begin():
-#            s.append(format_date(user, self.begin))
-#        else:
-#            s.append('')
-#
-#        if self.has_end():
-#            s.append(format_date(user, self.end))
-#        else:
-#            s.append('')
-#
-#        return '|'.join(s)
-#
-#    @classmethod
-#    def from_form_value(cls, value, user=None):
-#        parts = value.split('|')
-#
-#        if parts[0]=='open':
-#            return cls(open=True)
-#        elif parts[0]=='closed':
-#            return cls(closed=True)
-#        elif parts[0]=='range':
-#            beginstr = parts[1] if len(parts)>1 else ''
-#            if beginstr:
-#                begin = parse_date(user, beginstr)
-#            else:
-#                begin = None
-#
-#            endstr = parts[2] if len(parts)>2 else ''
-#            if endstr:
-#                end = parse_date(user, endstr)
-#            else:
-#                end = None
-#
-#            return cls(begin=begin, end=end)
-#
-#        raise ValueError