1 files changed, 34 insertions, 35 deletions
diff --git a/github3/models/user.py b/github3/models/user.py
index 3f0efc4..7ec7999 100644
--- a/github3/models/user.py
+++ b/github3/models/user.py
@@ -8,59 +8,58 @@ from .base import BaseResource
 class Plan(BaseResource):
     """Github Plan object model."""
 
-    _strs = ['name']
-    _ints = ['space', 'collaborators', 'private_repos']
+    @classmethod
+    def idl(self):
+        return {
+            'strs': ['name'],
+            'ints': ['space', 'collaborators', 'private_repos'],
+        }
 
     def __repr__(self):
-        return '<Plan {0}>'.format(str(self.name))
+        return '<Plan %s>' % self.name
 
 class Key(BaseResource):
     """Github Key object model."""
 
-    _strs = ['url', 'title', 'key']
-    _ints = ['id']
+    @classmethod
+    def idl(self):
+        return {
+            'strs': ['url', 'title', 'key'],
+            'ints': ['id'],
+        }
 
     def __repr__(self):
-        return '<Key {0}>'.format(str(self.title))
+        return '<Key %s>' % self.title
 
 class User(BaseResource):
     """Github User object model."""
 
-    _strs = [
-        'login','avatar_url', 'url', 'name', 'company', 'blog', 'location',
-        'email', 'bio', 'html_url', 'type']
-
-    _ints = ['id', 'public_repos', 'public_gists', 'followers', 'following']
-    _dates = ['created_at',]
-    _bools = ['hireable', ]
-
-    @property
-    def ri(self):
-        return ('users', self.login)
+    @classmethod
+    def idl(self):
+        return {
+            'strs': ['login','avatar_url', 'url', 'name', 'company', 'blog',
+                     'location', 'email', 'bio', 'html_url', 'type'],
+            'ints': [
+                'id', 'public_repos', 'public_gists', 'followers', 'following',
+                'total_private_repos', 'owned_private_repos', 'private_gists',
+                'disk_usage', 'collaborators'],
+            'maps': {'plan': Plan},
+            'dates': ['created_at',],
+            'bools': ['hireable', ],
+        }
 
     def __repr__(self):
-        return '<model.User {0}>'.format(self.login)
+        return '<User %s>' % self.login
 
-    def handler(self):
-        return self._gh.user_handler(self.login, force=True)
+    #def handler(self):
+    #    return self._gh.user_handler(self.login, force=True)
 
 class AuthUser(User):
-    """Github Current User object model."""
-
-    _ints = [
-        'id', 'public_repos', 'public_gists', 'followers', 'following',
-        'total_private_repos', 'owned_private_repos', 'private_gists',
-        'disk_usage', 'collaborators']
-    _map = {'plan': Plan}
-    _writeable = ['name', 'email', 'blog', 'company', 'location', 'hireable', 'bio']
-
-    def handler(self):
-        return self._gh.user_handler(self.login, force=True, private=True)
+    """Github Authenticated User object model."""
 
-    @property
-    def ri(self):
-        return ('user',)
+    #def handler(self):
+    #    return self._gh.user_handler(self.login, force=True, private=True)
 
     def __repr__(self):
-        return '<model.AuthUser {0}>'.format(self.login)
+        return '<AuthUser %s>' % self.login