From 397238b404a66ba25aec1e4d7902e16104eddefc Mon Sep 17 00:00:00 2001
From: David Medina <davidmedina9@gmail.com>
Date: Thu, 1 Mar 2012 13:12:00 +0100
Subject: Restructure modules and packages in a clean way

The docs has increased lines of code, so I split it
---
 pygithub3/requests/users/__init__.py | 32 ++++++++++++++++++++++++++++++--
 pygithub3/requests/users/emails.py   |  2 +-
 pygithub3/requests/users/user.py     | 35 -----------------------------------
 3 files changed, 31 insertions(+), 38 deletions(-)
 delete mode 100644 pygithub3/requests/users/user.py

(limited to 'pygithub3/requests/users')

diff --git a/pygithub3/requests/users/__init__.py b/pygithub3/requests/users/__init__.py
index 11e6a39..d8df00d 100644
--- a/pygithub3/requests/users/__init__.py
+++ b/pygithub3/requests/users/__init__.py
@@ -1,4 +1,32 @@
 # -*- encoding: utf-8 -*-
 
-from pygithub3.requests import Request, ValidationError
-from user import *
+from ..base import Request, ValidationError
+from pygithub3.resources.users import User
+
+
+class Get(Request):
+
+    resource = User
+    uri = 'users/{user}'
+
+    def clean_uri(self):
+        if not self.user:
+            return 'user'
+
+
+class Update(Request):
+
+    resource = User
+    uri = 'user'
+    body_schema = {
+        'schema': ('name', 'email', 'blog', 'company', 'location', 'hireable',
+                   'bio'),
+        'required': (),
+    }
+
+    def clean_body(self):
+        if not self.body:
+            raise ValidationError("'%s' request needs data. You can use "
+                                  "'%s' keys" % (self.__class__.__name__,
+                                  self.body_schema))
+        return self.body
diff --git a/pygithub3/requests/users/emails.py b/pygithub3/requests/users/emails.py
index ae4d8b8..ff89b62 100644
--- a/pygithub3/requests/users/emails.py
+++ b/pygithub3/requests/users/emails.py
@@ -25,7 +25,7 @@ class Add(Request):
 
     def clean_body(self):
         def is_email(email):
-            return bool(email_re.match(email))  # TODO: email regex ;)
+            return bool(email_re.match(email))
         if not self.body:
             raise ValidationError("'%s' request needs emails"
                                   % (self.__class__.__name__))
diff --git a/pygithub3/requests/users/user.py b/pygithub3/requests/users/user.py
deleted file mode 100644
index 3267f76..0000000
--- a/pygithub3/requests/users/user.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
-
-from . import Request, ValidationError
-from pygithub3.resources.users import User
-
-__all__ = ('Get', 'Update')
-
-
-class Get(Request):
-
-    resource = User
-    uri = 'users/{user}'
-
-    def clean_uri(self):
-        if not self.user:
-            return 'user'
-
-
-class Update(Request):
-
-    resource = User
-    uri = 'user'
-    body_schema = {
-        'schema': ('name', 'email', 'blog', 'company', 'location', 'hireable',
-                   'bio'),
-        'required': (),
-    }
-
-    def clean_body(self):
-        if not self.body:
-            raise ValidationError("'%s' request needs data. You can use "
-                                  "'%s' keys" % (self.__class__.__name__,
-                                  self.body_schema))
-        return self.body
-- 
cgit v1.3-8-gc7d7