forked from pool/jython
14adf8d273
* jython-cached-classes.patch * jython-cacheperms.patch * jython-makeCompiledFilename.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/jython?expand=0&rev=12
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 9adf26828ecf5650a86885b344b93242f6617220 Mon Sep 17 00:00:00 2001
|
|
From: Lubomir Rintel <lubo.rintel@gooddata.com>
|
|
Date: Wed, 3 Apr 2013 18:32:14 +0200
|
|
Subject: [PATCH 2/3] Avoid code duplication with makeCompiledFilename()
|
|
|
|
---
|
|
src/org/python/core/imp.java | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/org/python/core/imp.java b/src/org/python/core/imp.java
|
|
index a902079..a9868dd 100644
|
|
--- a/src/org/python/core/imp.java
|
|
+++ b/src/org/python/core/imp.java
|
|
@@ -424,7 +424,7 @@ public class imp {
|
|
|
|
int nlen = name.length();
|
|
String sourceName = "__init__.py";
|
|
- String compiledName = "__init__$py.class";
|
|
+ String compiledName = makeCompiledFilename(sourceName);
|
|
String directoryName = defaultEmptyPathDirectory(entry.toString());
|
|
|
|
// First check for packages
|
|
@@ -437,7 +437,7 @@ public class imp {
|
|
if (!pkg) {
|
|
Py.writeDebug(IMPORT_LOG, "trying source " + dir.getPath());
|
|
sourceName = name + ".py";
|
|
- compiledName = name + "$py.class";
|
|
+ compiledName = makeCompiledFilename(sourceName);
|
|
sourceFile = new File(directoryName, sourceName);
|
|
compiledFile = new File(directoryName, compiledName);
|
|
} else {
|
|
--
|
|
1.8.3.1
|
|
|