aboutsummaryrefslogtreecommitdiffstats
path: root/pygithub3/core
diff options
context:
space:
mode:
authorDavid Medina <davidmedina9@gmail.com>2012-02-03 14:45:32 +0100
committerDavid Medina <davidmedina9@gmail.com>2012-02-03 14:46:54 +0100
commitf01bc94a33d8644da65b5fa895c222e9ee057b50 (patch)
tree3bfc837901a54f97a30f1d24431d8322906de192 /pygithub3/core
parentPypi environment by setuptools (diff)
downloadpython-github3-f01bc94a33d8644da65b5fa895c222e9ee057b50.tar.xz
python-github3-f01bc94a33d8644da65b5fa895c222e9ee057b50.zip
Fix imports to new environment
Absolute imports as PEP8 tells
Diffstat (limited to '')
-rw-r--r--pygithub3/core/__init__.py (renamed from github3/core/__init__.py)0
-rw-r--r--pygithub3/core/client.py (renamed from github3/core/client.py)4
-rw-r--r--pygithub3/core/errors.py (renamed from github3/errors.py)0
-rw-r--r--pygithub3/core/resources/__init__.py (renamed from github3/core/resources/__init__.py)10
-rw-r--r--pygithub3/core/resources/users/__init__.py4
-rw-r--r--pygithub3/core/resources/users/emails.py9
-rw-r--r--pygithub3/core/resources/users/followers.py (renamed from github3/core/resources/user/followers.py)0
-rw-r--r--pygithub3/core/resources/users/keys.py (renamed from github3/core/resources/user/keys.py)0
-rw-r--r--pygithub3/core/resources/users/user.py (renamed from github3/core/resources/user/user.py)4
9 files changed, 26 insertions, 5 deletions
diff --git a/github3/core/__init__.py b/pygithub3/core/__init__.py
index e69de29..e69de29 100644
--- a/github3/core/__init__.py
+++ b/pygithub3/core/__init__.py
diff --git a/github3/core/client.py b/pygithub3/core/client.py
index 99a88f0..d4247af 100644
--- a/github3/core/client.py
+++ b/pygithub3/core/client.py
@@ -2,8 +2,8 @@
# -*- encoding: utf-8 -*-
import requests
-from errors import GithubError
+from .errors import GithubError
VALID_REQUEST_ARGS = set((
'params', 'data', 'headers', 'cookies', 'files', 'auth', 'timeout',
@@ -65,7 +65,7 @@ class Client(object):
def wrapper(self, verb, resource, **kwargs):
diffs = kwargs.viewkeys() - VALID_REQUEST_ARGS
new_params = kwargs.get('params') or {}
- new_params.update({key:kwargs[key] for key in diffs})
+ new_params.update({key: kwargs[key] for key in diffs})
kwargs['params'] = new_params
return func(self, verb, resource, **kwargs)
return wrapper
diff --git a/github3/errors.py b/pygithub3/core/errors.py
index 0d58c16..0d58c16 100644
--- a/github3/errors.py
+++ b/pygithub3/core/errors.py
diff --git a/github3/core/resources/__init__.py b/pygithub3/core/resources/__init__.py
index c5dee18..bca9607 100644
--- a/github3/core/resources/__init__.py
+++ b/pygithub3/core/resources/__init__.py
@@ -3,6 +3,9 @@
import re
+ABS_IMPORT_PREFIX = 'pygithub3.core.resources'
+
+
class UriNotFound(Exception):
pass
@@ -41,6 +44,7 @@ class Resource(object):
class Factory(object):
""" """
+
import_pattern = re.compile(r'^(\w+\.)+\w+$')
def __init__(self, **kwargs):
@@ -59,11 +63,13 @@ class Factory(object):
""" """
from importlib import import_module
+
def wrapper(self, resource_path):
module_chunk, s, uri_chunk = resource_path.rpartition('.')
try:
# TODO: CamelCase and under_score support, now only Class Name
- module = import_module('core.resources.%s' % module_chunk)
+ module = import_module('%s.%s'
+ % (ABS_IMPORT_PREFIX, module_chunk))
uri = getattr(module, uri_chunk.capitalize())
except ImportError:
raise UriNotFound("'%s' module does not exists" % module_chunk)
@@ -78,4 +84,4 @@ class Factory(object):
def __call__(self, resource_class=''):
resource = resource_class(self.args)
assert isinstance(resource, Resource)
- return resource
+ return resource
diff --git a/pygithub3/core/resources/users/__init__.py b/pygithub3/core/resources/users/__init__.py
new file mode 100644
index 0000000..84759a2
--- /dev/null
+++ b/pygithub3/core/resources/users/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+
+from pygithub3.core.resources import Resource
+from user import *
diff --git a/pygithub3/core/resources/users/emails.py b/pygithub3/core/resources/users/emails.py
new file mode 100644
index 0000000..18d520c
--- /dev/null
+++ b/pygithub3/core/resources/users/emails.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+
+from . import Resource
+#from pygithub3.models.
+
+
+class List(Resource):
+ pass
diff --git a/github3/core/resources/user/followers.py b/pygithub3/core/resources/users/followers.py
index e69de29..e69de29 100644
--- a/github3/core/resources/user/followers.py
+++ b/pygithub3/core/resources/users/followers.py
diff --git a/github3/core/resources/user/keys.py b/pygithub3/core/resources/users/keys.py
index e69de29..e69de29 100644
--- a/github3/core/resources/user/keys.py
+++ b/pygithub3/core/resources/users/keys.py
diff --git a/github3/core/resources/user/user.py b/pygithub3/core/resources/users/user.py
index 4308f01..1399ff8 100644
--- a/github3/core/resources/user/user.py
+++ b/pygithub3/core/resources/users/user.py
@@ -2,10 +2,11 @@
# -*- encoding: utf-8 -*-
from . import Resource
-from models.user import User
+from pygithub3.models.users import User
__all__ = ('Get', 'Update')
+
class Get(Resource):
model = User
@@ -19,5 +20,6 @@ class Get(Resource):
else:
return 'user'
+
class Update(Resource):
pass