better code style(flake8) and better test

Author: yuyang0

examples/epoll_server.py

@@ -103,7 +103,7 @@ def loop(cls, srv):
                         epobj.unregister(fileno)
                         connections[fileno].close()
                         del connections[fileno]
-		else:
+                else:
                     raise Exception()
 
 def parse_cmd_args():

pyfstack/_compat.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
 """
 internal python 2/python 3 bridges. Not for external use.
 """

pyfstack/_util.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-internal gevent utilities, not for external use.
+internal utilities, not for external use.
 """
 
 from __future__ import print_function, absolute_import, division
@@ -19,15 +19,19 @@ class _NONE(object):
     def __repr__(self):
         return '<default value>'
 
+
 _NONE = _NONE()
 
+
 def copy_globals(source,
                  globs,
                  only_names=None,
                  ignore_missing_names=False,
                  names_to_ignore=(),
-                 dunder_names_to_keep=('__implements__', '__all__', '__imports__'),
-                 cleanup_globs=True):
+                 names_to_include=(),
+                 dunder_names_to_keep=('__all__', '__imports__'),
+                 cleanup_globs=True,
+                 key_check_fn=None):
     """
     Copy attributes defined in `source.__dict__` to the dictionary in globs
     (which should be the caller's globals()).
@@ -37,8 +41,8 @@ def copy_globals(source,
     also ignored.
 
     If *only_names* is given, only those attributes will be considered.
-    In this case, *ignore_missing_names* says whether or not to raise an AttributeError
-    if one of those names can't be found.
+    In this case, *ignore_missing_names* says whether or not to raise an
+    AttributeError if one of those names can't be found.
 
     If cleanup_globs has a true value, then common things imported but not used
     at runtime are removed, including this function.
@@ -61,6 +65,10 @@ def copy_globals(source,
             continue
         if key.startswith("__") and key not in dunder_names_to_keep:
             continue
+        if key_check_fn and \
+           key_check_fn(key) is False and \
+           key not in names_to_include:
+            continue
         globs[key] = value
         copied.append(key)
 

pyfstack/fcntl.py

@@ -25,7 +25,7 @@ def fcntl(fd, cmd, arg=0):
         sz = len(arg)
         if sz > 1024:
             raise ValueError("fcntl string arg too long")
-        c_arg = ffi.new("char[%d]"%len(arg), arg)
+        c_arg = ffi.new("char[%d]" % len(arg), arg)
     else:
         raise ValueError("need integer or bytes")
     res = lib.ff_fcntl(fd, cmd, c_arg)
@@ -50,7 +50,7 @@ def ioctl(fd, request, arg=0, mutable_flag=True):
         sz = len(arg)
         if sz > 1024:
             raise ValueError("fcntl string arg too long")
-        c_arg = ffi.new("char[%d]"%len(arg), arg)
+        c_arg = ffi.new("char[%d]" % len(arg), arg)
 
         res = lib.ff_ioctl(fd, request, c_arg)
         if res < 0:

pyfstack/fstack.py

@@ -6,9 +6,8 @@
 """
 from __future__ import print_function, division, absolute_import
 import sys
-import os
 
-from ._compat import integer_types, binary_type
+from ._compat import integer_types
 from ._fstack import ffi, lib
 
 

pyfstack/select.py

@@ -7,43 +7,43 @@
 from __future__ import print_function, division, absolute_import
 import math
 from collections import defaultdict
-import select as _select
+# import select as _select
 
 from ._compat import integer_types
 from ._fstack import ffi, lib
 
 
-EPOLLERR      = lib.EPOLLERR
-EPOLLET       = lib.EPOLLET
-EPOLLHUP      = lib.EPOLLHUP
-EPOLLIN       = lib.EPOLLIN
-EPOLLMSG      = lib.EPOLLMSG
-EPOLLONESHOT  = lib.EPOLLONESHOT
-EPOLLOUT      = lib.EPOLLOUT
-EPOLLPRI      = lib.EPOLLPRI
-EPOLLRDBAND   = lib.EPOLLRDBAND
-EPOLLRDNORM   = lib.EPOLLRDNORM
-EPOLLWRBAND   = lib.EPOLLWRBAND
-EPOLLWRNORM   = lib.EPOLLWRNORM
+EPOLLERR = lib.EPOLLERR
+EPOLLET = lib.EPOLLET
+EPOLLHUP = lib.EPOLLHUP
+EPOLLIN = lib.EPOLLIN
+EPOLLMSG = lib.EPOLLMSG
+EPOLLONESHOT = lib.EPOLLONESHOT
+EPOLLOUT = lib.EPOLLOUT
+EPOLLPRI = lib.EPOLLPRI
+EPOLLRDBAND = lib.EPOLLRDBAND
+EPOLLRDNORM = lib.EPOLLRDNORM
+EPOLLWRBAND = lib.EPOLLWRBAND
+EPOLLWRNORM = lib.EPOLLWRNORM
 # EPOLL_CLOEXEC = _select.EPOLL_CLOEXEC
-PIPE_BUF      = lib.PIPE_BUF
-POLLERR       = lib.POLLERR
-POLLHUP       = lib.POLLHUP
-POLLIN        = lib.POLLIN
-POLLMSG       = lib.POLLMSG
-POLLNVAL      = lib.POLLNVAL
-POLLOUT       = lib.POLLOUT
-POLLPRI       = lib.POLLPRI
-POLLRDBAND    = lib.POLLRDBAND
-POLLRDNORM    = lib.POLLRDNORM
-POLLWRBAND    = lib.POLLWRBAND
-POLLWRNORM    = lib.POLLWRNORM
+PIPE_BUF = lib.PIPE_BUF
+POLLERR = lib.POLLERR
+POLLHUP = lib.POLLHUP
+POLLIN = lib.POLLIN
+POLLMSG = lib.POLLMSG
+POLLNVAL = lib.POLLNVAL
+POLLOUT = lib.POLLOUT
+POLLPRI = lib.POLLPRI
+POLLRDBAND = lib.POLLRDBAND
+POLLRDNORM = lib.POLLRDNORM
+POLLWRBAND = lib.POLLWRBAND
+POLLWRNORM = lib.POLLWRNORM
 
 # fliters
 KQ_FILTER_READ = lib.EVFILT_READ
-KQ_FILTER_WRITE	= lib.EVFILT_WRITE
+KQ_FILTER_WRITE = lib.EVFILT_WRITE
 KQ_FILTER_AIO = lib.EVFILT_AIO
-KQ_FILTER_VNODE	= lib.EVFILT_VNODE
+KQ_FILTER_VNODE = lib.EVFILT_VNODE
 KQ_FILTER_PROC = lib.EVFILT_PROC
 # KQ_FILTER_NETDEV = lib.EVFILT_NETDEV
 KQ_FILTER_SIGNAL = lib.EVFILT_SIGNAL
@@ -66,22 +66,22 @@
 
 
 NOTE_DELETE = lib.NOTE_DELETE
-NOTE_WRITE  = lib.NOTE_WRITE
+NOTE_WRITE = lib.NOTE_WRITE
 NOTE_EXTEND = lib.NOTE_EXTEND
 NOTE_ATTRIB = lib.NOTE_ATTRIB
-NOTE_LINK   = lib.NOTE_LINK
+NOTE_LINK = lib.NOTE_LINK
 NOTE_RENAME = lib.NOTE_RENAME
 NOTE_REVOKE = lib.NOTE_REVOKE
 
 
-NOTE_EXIT       = lib.NOTE_EXIT
-NOTE_FORK       = lib.NOTE_FORK
-NOTE_EXEC       = lib.NOTE_EXEC
-NOTE_PCTRLMASK  = lib.NOTE_PCTRLMASK
-NOTE_PDATAMASK  = lib.NOTE_PDATAMASK
-NOTE_TRACK      = lib.NOTE_TRACK
-NOTE_TRACKERR   = lib.NOTE_TRACKERR
-NOTE_CHILD      = lib.NOTE_CHILD
+NOTE_EXIT = lib.NOTE_EXIT
+NOTE_FORK = lib.NOTE_FORK
+NOTE_EXEC = lib.NOTE_EXEC
+NOTE_PCTRLMASK = lib.NOTE_PCTRLMASK
+NOTE_PDATAMASK = lib.NOTE_PDATAMASK
+NOTE_TRACK = lib.NOTE_TRACK
+NOTE_TRACKERR = lib.NOTE_TRACKERR
+NOTE_CHILD = lib.NOTE_CHILD
 
 
 class error(Exception):
@@ -116,7 +116,8 @@ def select(rlist, wlist, xlist, timeout=None):
         tvp = ffi.NULL
     else:
         t1, t2 = math.modf(timeout)
-        tvp = ffi.new("struct timeval*", {"tv_sec":t1, "tv_usec":int(t2*1000)})
+        tv = {"tv_sec": t1, "tv_usec": int(t2*1000)}
+        tvp = ffi.new("struct timeval*", tv)
     ret = lib.ff_select(maxfd1, rfdset, wfdset, xfdset, tvp)
     if ret < 0:
         raise error("select: ")
@@ -196,7 +197,8 @@ def poll(self, timeout=-1, maxevents=-1):
         if maxevents != self.maxevents:
             self.events = ffi.new("struct epoll_event[]", maxevents)
             self.maxevents = maxevents
-        nfds = lib.ff_epoll_wait(self.epfd, self.events, self.maxevents, timeout)
+        nfds = lib.ff_epoll_wait(self.epfd, self.events,
+                                 self.maxevents, timeout)
         if nfds < 0:
             raise error("poll: ")
         res = []