Merge lp:~soren/riakalchemy/pep8 into lp:riakalchemy

[Soren Hansen]

pep8

=== modified file 'riakalchemy/__init__.py'
--- riakalchemy/__init__.py	2011-11-19 23:31:19 +0000
+++ riakalchemy/__init__.py	2011-11-25 22:37:23 +0000
@@ -6,6 +6,7 @@
 global RiakObject
 global connect
 
+
 def use_real_backend():
     global RiakObject
     global connect

=== modified file 'riakalchemy/exceptions.py'
--- riakalchemy/exceptions.py	2011-10-24 08:09:20 +0000
+++ riakalchemy/exceptions.py	2011-11-25 22:37:23 +0000
@@ -1,9 +1,10 @@
 class RiakAlchemyError(Exception):
     pass
 
+
 class ValidationError(RiakAlchemyError):
     pass
 
+
 class NoSuchObjectError(RiakAlchemyError):
     pass
-

=== removed file 'riakalchemy/meta.py'
--- riakalchemy/meta.py	2011-10-20 09:41:48 +0000
+++ riakalchemy/meta.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-

=== modified file 'riakalchemy/model.py'
--- riakalchemy/model.py	2011-11-19 23:29:44 +0000
+++ riakalchemy/model.py	2011-11-25 22:37:23 +0000
@@ -5,6 +5,7 @@
 from riakalchemy.exceptions import ValidationError, NoSuchObjectError
 from riakalchemy.types import RiakType
 
+
 class RiakModelRegistry(object):
     def __init__(self):
         self._registry = []
@@ -21,6 +22,7 @@
 
 _registry = RiakModelRegistry()
 
+
 class RiakObjectMeta(type):
     def __new__(cls, name, bases, attrs):
         super_new = super(RiakObjectMeta, cls).__new__
@@ -39,7 +41,6 @@
         return new_class
 
 
-
 class RiakObject(object):
     __metaclass__ = RiakObjectMeta
     searchable = False
@@ -87,8 +88,8 @@
                 value = getattr(self, field, [])
                 for rel in value:
                     if not isinstance(rel, RiakObject):
-                        raise ValidationError('%s attribute of %s must be another '
-                                              'RiakObject' %
+                        raise ValidationError('%s attribute of %s must be '
+                                              'another RiakObject' %
                                               (field, self.__class__.__name__))
 
                 for link in self._links:
@@ -97,7 +98,8 @@
                         self._links.remove(link)
 
                 for link in value:
-                    self._links += [RiakLink(link.bucket_name, link.key, tag=field)]
+                    self._links += [RiakLink(link.bucket_name,
+                                             link.key, tag=field)]
             else:
                 if hasattr(self, field):
                     value = self._meta[field].clean(getattr(self, field))
@@ -118,9 +120,13 @@
         if len(kwargs) == 1:
             field = kwargs.keys()[0]
             if cls._meta[field].link_type and cls._meta[field].backref:
-                  bucket = client.bucket(cls.bucket_name)
-                  index_query = client.index(cls.bucket_name, '%s_bin' % (field,), '%s/%s' % (kwargs[field].bucket_name, kwargs[field].key))
-                  return RiakObjectQuery(index_query, cls, True)
+                bucket = client.bucket(cls.bucket_name)
+                _2i_key = '%s_bin' % (field,)
+                _2i_value = ('%s/%s' % (kwargs[field].bucket_name,
+                                        kwargs[field].key))
+                index_query = client.index(cls.bucket_name,
+                                           _2i_key, _2i_value)
+                return RiakObjectQuery(index_query, cls, True)
         elif cls.searchable and kwargs:
             return cls.get_search(**kwargs)
         else:
@@ -128,14 +134,16 @@
 
     @classmethod
     def get_search(cls, **kwargs):
-        terms = ' AND '.join(['%s:"%s"' % (k,v) for k,v in kwargs.iteritems()])
+        terms = ' AND '.join(['%s:"%s"' % (k, v)
+                                               for k, v in kwargs.iteritems()])
         query = client.search(cls.bucket_name, terms)
         return RiakObjectQuery(query, cls, True)
 
     @classmethod
     def get_mr(cls, **kwargs):
         query = client.add(cls.bucket_name)
-        terms = ' && '.join(['true'] + ['data.%s=="%s"' % (k,v) for k,v in kwargs.iteritems()])
+        terms = (' && '.join(['true'] +
+                 ['data.%s=="%s"' % (k, v) for k, v in kwargs.iteritems()]))
         map_func = """function(v) {
                           var data = JSON.parse(v.values[0].data);
                           if(%s) {
@@ -175,7 +183,8 @@
             bucket.enable_search()
 
         data_dict = dict((k, getattr(self, k)) for k in self._meta
-                                                if not self._meta[k].link_type and hasattr(self, k))
+                                                if not self._meta[k].link_type
+                                                   and hasattr(self, k))
         if self._riak_obj:
             self._riak_obj.set_data(data_dict)
         else:
@@ -193,7 +202,9 @@
             if self._meta[field].link_type and self._meta[field].backref:
                 value = getattr(self, field)
                 for link in value:
-                    self._riak_obj.add_index('%s_bin' % (field,), '%s/%s' % (link.bucket_name, link.key))
+                    self._riak_obj.add_index('%s_bin' % (field,),
+                                             '%s/%s' % (link.bucket_name,
+                                                        link.key))
 
         self._riak_obj.store()
         self.key = self._riak_obj.get_key()
@@ -217,10 +228,12 @@
 client = None
 _test_server = None
 
+
 def reset_registry():
     global _registry
     _registry = RiakModelRegistry()
 
+
 def connect(host='127.0.0.1', port=8098, test_server=False):
     global client
     if test_server:
@@ -237,6 +250,7 @@
 
     client = riak.RiakClient(host=host, port=port)
 
+
 def _clear_test_connection():
     global _test_server
     _test_server.recycle()

=== modified file 'riakalchemy/tests/test_basic.py'
--- riakalchemy/tests/test_basic.py	2011-11-16 21:40:07 +0000
+++ riakalchemy/tests/test_basic.py	2011-11-25 22:37:23 +0000
@@ -17,9 +17,11 @@
     supports_indexes = False
     riak_port = 10229
 
+
 class _BasicTests(unittest.TestCase):
     def _create_class(self, searchable=False, last_name_required=False):
         _searchable = searchable
+
         class Person(RiakObject):
             searchable = _searchable
             bucket_name = 'users1'
@@ -43,7 +45,7 @@
 
     def _incomplete_value_set(self):
         return {'first_name': 'soren',
-                'age': 31 }
+                'age': 31}
 
     def _set_values_on_init(self, values, searchable=False,
                             last_name_required=False):
@@ -58,7 +60,7 @@
 
     def _object_create_and_setattr(self, values):
         cls, obj = self._create_object()
-        for k,v in values.iteritems():
+        for k, v in values.iteritems():
             setattr(obj, k, v)
         return cls, obj
 
@@ -135,7 +137,8 @@
 
     def _test_retrieve_by_values(self, searchable):
         values = self._incomplete_value_set()
-        cls, obj = self._set_values_on_init(searchable=searchable, values=values)
+        cls, obj = self._set_values_on_init(searchable=searchable,
+                                            values=values)
         obj.save()
         self.addCleanup(obj.delete)
 
@@ -258,6 +261,7 @@
         self.assertIn(persons[1].first_name, [persons[0].first_name,
                                               persons[1].first_name])
 
+
 class RiakBackedTests(_BasicTests):
     test_server_started = False
 

=== modified file 'riakalchemy/types.py'
--- riakalchemy/types.py	2011-11-05 20:03:19 +0000
+++ riakalchemy/types.py	2011-11-25 22:37:23 +0000
@@ -1,5 +1,6 @@
 from riakalchemy.exceptions import ValidationError
 
+
 class RiakType(object):
     link_type = False
 
@@ -12,12 +13,15 @@
     def validate(self, value):
         return True
 
+
 class Dict(RiakType):
     pass
 
+
 class String(RiakType):
     pass
 
+
 class Integer(RiakType):
     def clean(self, value):
         try:
@@ -25,8 +29,10 @@
         except ValueError:
             raise ValidationError("%r could not be cast to integer" % (value,))
 
+
 class RelatedObjects(RiakType):
     link_type = True
+
     def __init__(self, backref=False, **kwargs):
         super(RelatedObjects, self).__init__(**kwargs)
         self.backref = backref

=== modified file 'setup.py'
--- setup.py	2011-11-19 23:31:19 +0000
+++ setup.py	2011-11-25 22:37:23 +0000
@@ -13,8 +13,8 @@
     url='https://launchpad.net/riakalchemy',
     packages=['riakalchemy'],
     install_requires=['riak'],
-    test_suite = 'nose.collector',
-    classifiers = [
+    test_suite='nose.collector',
+    classifiers=[
         'Development Status :: 1 - Planning',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: '