Merge pull request #70 from cs50/develop

removes Reader

Author: Kareem Zidane

.travis.yml

@@ -1,7 +1,7 @@
 language: python
 python:
 - '2.7'
-- '3.4'
+- '3.6'
 branches:
   except: "/^v\\d/"
 services:
@@ -20,7 +20,7 @@ after_script: rm -f test.db
 jobs:
   include:
   - stage: deploy
-    python: '3.4'
+    python: '3.6'
     install: skip
     before_script: skip
     script: skip

setup.py

@@ -16,5 +16,5 @@
     package_dir={"": "src"},
     packages=["cs50"],
     url="https://github.com/cs50/python-cs50",
-    version="3.0.1"
+    version="3.1.0"
 )

src/cs50/cs50.py

@@ -28,31 +28,22 @@ def write(self, x):
         self.f.flush()
 
 
-class Reader:
-    """
-    Disable buffering for input() as well.
-
-    https://bugs.python.org/issue24402
-    """
-
-    def __init__(self, f):
-        self.f = f
-
-    def __getattr__(self, name):
-        return getattr(self.f, name)
-
-    def fileno():
-        raise OSError()
-
-    def read(self, size):
-        return self.f.read(size)
-
-
 sys.stderr = flushfile(sys.stderr)
-sys.stdin = Reader(sys.stdin)
 sys.stdout = flushfile(sys.stdout)
 
 
+def eprint(*args, **kwargs):
+    """
+    Print an error message to standard error, prefixing it with
+    file name and line number from which method was called.
+    """
+    end = kwargs.get("end", "\n")
+    sep = kwargs.get("sep", " ")
+    (filename, lineno) = inspect.stack()[1][1:3]
+    print("{}:{}: ".format(filename, lineno), end="")
+    print(*args, end=end, file=sys.stderr, sep=sep)
+
+
 def formatException(type, value, tb):
     """
     Format traceback, darkening entries from global site-packages directories