From 7e8bf5cf5ea5de8c5cf5826a9840aeaa57eae71a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Talha=20Bu=C4=9Fra=20Bulut?= <talhabulut@hotmail.com>
Date: Tue, 18 Oct 2016 23:02:02 +0300
Subject: conflict fix with random module

---
 example/app2/plugins/random.py    | 14 --------------
 example/app2/plugins/randomstr.py | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 example/app2/plugins/random.py
 create mode 100644 example/app2/plugins/randomstr.py

(limited to 'example')

diff --git a/example/app2/plugins/random.py b/example/app2/plugins/random.py
deleted file mode 100644
index ed4c159..0000000
--- a/example/app2/plugins/random.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import random
-import string
-
-
-def make_random(s):
-    chars = list(s)
-    for idx, char in enumerate(chars):
-        if char not in string.punctuation and not char.isspace():
-            chars[idx] = random.choice(string.ascii_letters)
-    return ''.join(chars)
-
-
-def setup(app):
-    app.register_formatter('random', make_random)
diff --git a/example/app2/plugins/randomstr.py b/example/app2/plugins/randomstr.py
new file mode 100644
index 0000000..ed4c159
--- /dev/null
+++ b/example/app2/plugins/randomstr.py
@@ -0,0 +1,14 @@
+import random
+import string
+
+
+def make_random(s):
+    chars = list(s)
+    for idx, char in enumerate(chars):
+        if char not in string.punctuation and not char.isspace():
+            chars[idx] = random.choice(string.ascii_letters)
+    return ''.join(chars)
+
+
+def setup(app):
+    app.register_formatter('random', make_random)
-- 
cgit v1.2.1