From f175212c831faae6fd082554c4f49dd62907bf12 Mon Sep 17 00:00:00 2001 From: Ramon Crehuet Date: Fri, 13 Nov 2015 13:17:57 +0100 Subject: [PATCH 1/3] Adapted to Python 3. Just 2 cells --- Version Control.ipynb | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Version Control.ipynb b/Version Control.ipynb index a078a1b..b20ac46 100644 --- a/Version Control.ipynb +++ b/Version Control.ipynb @@ -255,14 +255,13 @@ { "cell_type": "code", "collapsed": false, - "input": [ - "import sha\n", - "\n", - "# Our first commit\n", - "data1 = 'This is the start of my paper2.'\n", - "meta1 = 'date: 1/1/12'\n", - "hash1 = sha.sha(data1 + meta1).hexdigest()\n", - "print 'Hash:', hash1" + "import hashlib\n", + "\n", + "# Our first commit\n", + "data1 = b'This is the start of my paper2.'\n", + "meta1 = b'date: 1/1/12'\n", + "hash1 = hashlib.sha1(data1+meta1).hexdigest().encode()\n", + "print('Hash:', hash1)" ], "language": "python", "metadata": {}, @@ -281,12 +280,12 @@ "cell_type": "code", "collapsed": false, "input": [ - "# Our second commit, linked to the first\n", - "data2 = 'Some more text in my paper...'\n", - "meta2 = 'date: 1/2/12'\n", - "# Note we add the parent hash here!\n", - "hash2 = sha.sha(data2 + meta2 + hash1).hexdigest()\n", - "print 'Hash:', hash2" + "# Our second commit, linked to the first\n", + "data2 = b'Some more text in my paper...'\n", + "meta2 = b'date: 1/2/12'\n", + "# Note we add the parent hash here!\n", + "hash2 = hashlib.sha1(data2 + meta2 + hash1).hexdigest().encode()\n", + "print('Hash:', hash2)" ], "language": "python", "metadata": {}, From aa8e87e7fa21de4a82bfe8345fff3c74f2fc0081 Mon Sep 17 00:00:00 2001 From: Ramon Crehuet Date: Fri, 13 Nov 2015 13:20:35 +0100 Subject: [PATCH 2/3] Corrected a typo --- Version Control.ipynb | 1 + 1 file changed, 1 insertion(+) diff --git a/Version Control.ipynb b/Version Control.ipynb index b20ac46..ddf9085 100644 --- a/Version Control.ipynb +++ b/Version Control.ipynb @@ -255,6 +255,7 @@ { "cell_type": "code", "collapsed": false, + "input": [ "import hashlib\n", "\n", "# Our first commit\n", From 1600de30361e53211cbb63444e02b4ae5e3d7821 Mon Sep 17 00:00:00 2001 From: Ramon Crehuet Date: Fri, 13 Nov 2015 13:23:28 +0100 Subject: [PATCH 3/3] Adapted output --- Version Control.ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Version Control.ipynb b/Version Control.ipynb index ddf9085..d175acf 100644 --- a/Version Control.ipynb +++ b/Version Control.ipynb @@ -271,7 +271,7 @@ "output_type": "stream", "stream": "stdout", "text": [ - "Hash: 7bb695b77966e27cfaebfa59e27a0b91f1d33813\n" + "Hash: b'7bb695b77966e27cfaebfa59e27a0b91f1d33813'\n" ] } ], @@ -295,7 +295,7 @@ "output_type": "stream", "stream": "stdout", "text": [ - "Hash: 543da8bac9f643ba5611897b192a16dea42d2ab7\n" + "Hash: b'543da8bac9f643ba5611897b192a16dea42d2ab7'\n" ] } ],