← Back to branch summary

~ubuntuone-pqm-team/django-model-utils/stable

« back to all changes in this revision

Viewing changes to model_utils/managers.py

  • Committer: Carl Meyer
  • Date: 2013-01-27 21:41:03 UTC
  • Revision ID: git-v1:983fab034181df118b68a94d2ebd9ef8e0fcff5c
Clean up some uses of hasattr; no need to support 1.1 any longer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
model_utils/managers.py
72
72
            self._q = args[0]
73
73
        else:
74
74
            self._q = models.Q(**kwargs)
 
75
        self._order_by = None
75
76
        super(QueryManager, self).__init__()
76
77
 
77
78
    def order_by(self, *args):
80
81
 
81
82
    def get_query_set(self):
82
83
        qs = super(QueryManager, self).get_query_set().filter(self._q)
83
 
        if hasattr(self, '_order_by'):
 
84
        if self._order_by is not None:
84
85
            return qs.order_by(*self._order_by)
85
86
        return qs
86
87
 
119
120
 
120
121
    def get_query_set(self):
121
122
        if self._queryset_cls is not None:
122
 
            kargs = {'model': self.model}
123
 
            if hasattr(self, '_db'):
124
 
                kargs['using'] = self._db
125
 
            return self._queryset_cls(**kargs)
 
123
            kwargs = {'model': self.model}
 
124
            kwargs['using'] = self._db
 
125
            return self._queryset_cls(**kwargs)
126
126
        return super(PassThroughManager, self).get_query_set()
127
127
 
128
128
    @classmethod
137
137
 
138
138
        def get_query_set(self):
139
139
            kwargs = {}
140
 
            if hasattr(self, "_db"):
141
 
                kwargs["using"] = self._db
 
140
            kwargs["using"] = self._db
142
141
            return queryset_cls(self.model, **kwargs)
143
142
 
144
143
        def __reduce__(self):