From 169b8cb51f2862db56a1adab4754e3c278a1cbdb Mon Sep 17 00:00:00 2001
From: s45162 <ms15159@st.amu.edu.pl>
Date: Sun, 3 Dec 2017 15:20:49 +0100
Subject: [PATCH] Merge branch 'master' of
 https://git.wmi.amu.edu.pl/tdwojak/Python2017

# Conflicts:
#	labs02/test_task.py
---
 labs03/Podstawy 2.ipynb | 230 ++++++----------------------------------
 labs04/Klasy.ipynb      |  12 +--
 labs04/task01.py        |   7 ++
 3 files changed, 48 insertions(+), 201 deletions(-)

diff --git a/labs03/Podstawy 2.ipynb b/labs03/Podstawy 2.ipynb
index adf5795..53da94e 100644
--- a/labs03/Podstawy 2.ipynb	
+++ b/labs03/Podstawy 2.ipynb	
@@ -49,34 +49,22 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "slide"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "2\n",
-      "[1, 2, 3, 1, 2, 3]\n",
-      "123\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
-    "def dwojak(x): \n",
-    "    x *= 2\n",
-    "    return x\n",
+    "def dwojak(x): x *= 2\n",
     "    \n",
     "l = [1, 2, 3]\n",
     "s = \"123\"\n",
     "\n",
     "dwojak(l)\n",
     "dwojak(s)\n",
-    "print(dwojak(1))\n",
+    "\n",
     "print(l)\n",
     "print(s)"
    ]
@@ -116,28 +104,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "slide"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "[1, 2, 3, 1, 2, 3]\n",
-      "F: [1, 2, 3, 1, 2, 3]\n",
-      "[1, 2, 3]\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "def dwojak1(x): x *= 2\n",
-    "def dwojak2(x): \n",
-    "    x = x * 2\n",
-    "    print(\"F:\", x)\n",
+    "def dwojak2(x): x = x * 2\n",
     "\n",
     "l = [1,2, 3]\n",
     "dwojak1(l)\n",
@@ -150,47 +126,29 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "slide"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "[1, 2, 3]\n",
-      "[1, 2, 3, 4]\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "l = [1, 2, 3]\n",
-    "e = l[:]\n",
+    "e = l\n",
     "e.append(4)\n",
-    "print(l)\n",
-    "print(e)"
+    "print(l)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "slide"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "[[1], [1], [1]]\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "e = []\n",
     "f = [e for i in range(3)]\n",
@@ -214,39 +172,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 25,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "slide"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "(1, 'napis', [0])\n",
-      "3\n"
-     ]
-    },
-    {
-     "ename": "TypeError",
-     "evalue": "unhashable type: 'list'",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mTypeError\u001b[0m                                 Traceback (most recent call last)",
-      "\u001b[0;32m<ipython-input-25-2bd2fa17fbf5>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      3\u001b[0m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mt\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      4\u001b[0m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mlen\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mt\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 5\u001b[0;31m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m{\u001b[0m\u001b[0mt\u001b[0m\u001b[0;34m:\u001b[0m \u001b[0;32mNone\u001b[0m\u001b[0;34m}\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
-      "\u001b[0;31mTypeError\u001b[0m: unhashable type: 'list'"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
-    "t = (1, \"napis\", [])\n",
-    "t[-1].append(0)\n",
+    "t = (1, \"napis\", None)\n",
+    "elem = t[0]\n",
     "print(t)\n",
-    "print(len(t))\n",
-    "print({t: None})"
+    "print(len(t))"
    ]
   },
   {
@@ -262,29 +199,19 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 36,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "fragment"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "15\n",
-      "a == 1\n",
-      "b == (3, 4)\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "def suma(*args):\n",
     "    return sum(args)\n",
     "print(suma(1,2,3,4,5))\n",
     "\n",
-    "def greet_me(z=None,**kwargs):\n",
+    "def greet_me(**kwargs):\n",
     "    if kwargs is not None:\n",
     "        for key, value in kwargs.items():\n",
     "            print(\"%s == %s\" %(key,value))\n",
@@ -304,32 +231,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 38,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "fragment"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "97\n",
-      "a\n",
-      "98\n",
-      "b\n",
-      "99\n",
-      "c\n",
-      "100\n",
-      "d\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "def alfaRange(x, y):\n",
     "    for i in range(ord(x), ord(y)):\n",
-    "        print(i)\n",
     "        yield chr(i)\n",
     "\n",
     "for c in alfaRange('a', 'e'):\n",
@@ -349,74 +260,40 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 45,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "fragment"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "W Paryżu najlepsze kasztany są na placu Pigalle\n",
-      "Zuzanna lubi je tylko jesienią.\n",
-      "\n",
-      ">>\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "plik = open(\"haslo.txt\", 'r')\n",
     "for linia in plik.readlines():\n",
     "    print(linia.strip())\n",
     "print(plik.read())\n",
-    "print(\">>\")\n",
     "plik.close()"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 47,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "slide"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "W Paryżu najlepsze kasztany są na placu Pigalle\n",
-      "\n",
-      "Zuzanna lubi je tylko jesienią.\n",
-      "\n"
-     ]
-    },
-    {
-     "ename": "ValueError",
-     "evalue": "I/O operation on closed file.",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mValueError\u001b[0m                                Traceback (most recent call last)",
-      "\u001b[0;32m<ipython-input-47-f06513c1bbec>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      2\u001b[0m     \u001b[0;32mfor\u001b[0m \u001b[0mlinia\u001b[0m \u001b[0;32min\u001b[0m \u001b[0mplik\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mreadlines\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      3\u001b[0m         \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mlinia\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 4\u001b[0;31m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mplik\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mread\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
-      "\u001b[0;31mValueError\u001b[0m: I/O operation on closed file."
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "with open(\"haslo.txt\", 'r') as plik:\n",
     "    for linia in plik.readlines():\n",
     "        print(linia)\n",
-    "print(plik.read())"
+    "# print(plik.read())"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 48,
+   "execution_count": null,
    "metadata": {
     "collapsed": true,
     "slideshow": {
@@ -457,22 +334,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 49,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "fragment"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "posix\n",
-      "Nazwa uzytkownika: tomaszd\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import os\n",
     "print(os.name)\n",
@@ -483,31 +351,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 50,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "slide"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Counter({'o': 4, 'n': 4, 'a': 4, 'k': 3, 't': 3, 'y': 2, 'i': 2, 'c': 2, 'z': 2, 's': 1, 'p': 1, 'l': 1, 'ń': 1, 'w': 1, 'e': 1})\n"
-     ]
-    },
-    {
-     "data": {
-      "text/plain": [
-       "array([[ 1.,  3.,  4.,  5.]], dtype=float32)"
-      ]
-     },
-     "execution_count": 50,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "from collections import *\n",
     "print(Counter(\"konstantynopolitańczykowianeczka\"))\n",
@@ -544,23 +394,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 51,
+   "execution_count": null,
    "metadata": {
     "slideshow": {
      "slide_type": "fragment"
     }
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "What's your name?\n",
-      "Tomasz\n",
-      "Welcome home, Tomasz.\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "name = input(\"What's your name?\\n\")\n",
     "print(\"Welcome home, {}.\".format(name))"
diff --git a/labs04/Klasy.ipynb b/labs04/Klasy.ipynb
index 1cd0a99..bb3dbee 100644
--- a/labs04/Klasy.ipynb
+++ b/labs04/Klasy.ipynb
@@ -309,13 +309,13 @@
     {
      "ename": "AttributeError",
      "evalue": "'Parser' object has no attribute '__parse'",
-     "output_type": "error",
      "traceback": [
       "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
       "\u001b[0;31mAttributeError\u001b[0m                            Traceback (most recent call last)",
       "\u001b[0;32m<ipython-input-6-80ee186598d3>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      4\u001b[0m \u001b[0mparser\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mParser\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      5\u001b[0m \u001b[0mparser\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0m_get\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 6\u001b[0;31m \u001b[0mparser\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0m__parse\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
       "\u001b[0;31mAttributeError\u001b[0m: 'Parser' object has no attribute '__parse'"
-     ]
+     ],
+     "output_type": "error"
     }
    ],
    "source": [
@@ -465,13 +465,13 @@
     {
      "ename": "FileNotFoundError",
      "evalue": "[Errno 2] No such file or directory: 'nieistniejący_plik.txt'",
-     "output_type": "error",
      "traceback": [
       "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
       "\u001b[0;31mFileNotFoundError\u001b[0m                         Traceback (most recent call last)",
       "\u001b[0;32m<ipython-input-20-41928d542bef>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0;32mwith\u001b[0m \u001b[0mopen\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"nieistniejący_plik.txt\"\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mplik\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m      2\u001b[0m     \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mplik\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mread\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
       "\u001b[0;31mFileNotFoundError\u001b[0m: [Errno 2] No such file or directory: 'nieistniejący_plik.txt'"
-     ]
+     ],
+     "output_type": "error"
     }
    ],
    "source": [
@@ -614,13 +614,13 @@
     {
      "ename": "MyError",
      "evalue": "Coś poszło nie tak!",
-     "output_type": "error",
      "traceback": [
       "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
       "\u001b[0;31mMyError\u001b[0m                                   Traceback (most recent call last)",
       "\u001b[0;32m<ipython-input-36-4fb306b42ebc>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0;32mraise\u001b[0m \u001b[0mMyError\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"Coś poszło nie tak!\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
       "\u001b[0;31mMyError\u001b[0m: Coś poszło nie tak!"
-     ]
+     ],
+     "output_type": "error"
     }
    ],
    "source": [
diff --git a/labs04/task01.py b/labs04/task01.py
index 88741a4..27593b6 100644
--- a/labs04/task01.py
+++ b/labs04/task01.py
@@ -1,3 +1,10 @@
 #!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 
+def is_numeric(lista):
+    for x in lista:
+        if not(isinstance(x,float)) and not(isinstance(x,int)):
+            return False
+    return True
+
+print(is_numeric([5,56]))
\ No newline at end of file